* tests/cp/acl: Skip this test when cp lacks ACL support.

* tests/cp/Makefile.am (TESTS_ENVIRONMENT): Set $(CONFIG_HEADER).

diff --git a/ChangeLog b/ChangeLog
index 086a49699fc1c904dd418bcf0a4c17ba68969621..708e149140d4eecac55ec4d9c156512d9be8787d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-05  Jim Meyering  <jim@meyering.net>
 
+       * tests/cp/acl: Skip this test when cp lacks ACL support.
+       * tests/cp/Makefile.am (TESTS_ENVIRONMENT): Set $(CONFIG_HEADER).
+
        * src/c99-to-c89.diff (remove.c): Adapt one hunk to match the new
        context from change of 2006-09-02.
 

diff --git a/tests/cp/Makefile.am b/tests/cp/Makefile.am
index dd758404f73639e480595134b56f5f34ea9af214..a96eab7ae01557c364e20adc802c11a3a4c63512 100644 (file)
--- a/tests/cp/Makefile.am
+++ b/tests/cp/Makefile.am
@@ -34,4 +34,5 @@ TESTS = \
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   MAKE=$(MAKE) \
+  CONFIG_HEADER=$(CONFIG_HEADER) \
   PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"

diff --git a/tests/cp/acl b/tests/cp/acl
index 5221ee9acbc204fa926106a8ddd02c16ed6594d4..02761ced2c2c817b55ec98f21e28bdb0d1f8e099 100755 (executable)
--- a/tests/cp/acl
+++ b/tests/cp/acl
@@ -23,6 +23,13 @@
 # Make sure we get English translations.
 . $srcdir/../lang-default
 
+# Skip this test if cp was built without ACL support:
+grep '^#define USE_ACL 0' $CONFIG_HEADER > /dev/null && \
+  {
+    echo 1>&2 "$0: insufficient ACL support, so skipping this test"
+    (exit 77); exit 77
+  }
+
 if test "$VERBOSE" = yes; then
   set -x
   mv --version