diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | tests/cp/Makefile.am | 1 | ||||
| -rwxr-xr-x | tests/cp/acl | 7 |
3 files changed, 11 insertions, 0 deletions
@@ -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 dd758404f..a96eab7ae 100644 --- 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 5221ee9ac..02761ced2 100755 --- 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 |