From: Jim Meyering Date: Fri, 2 Mar 2007 13:25:48 +0000 (+0100) Subject: pwd-unreadable-parent: Skip test on non-Linux/GNU systems. X-Git-Tag: COREUTILS-6_9~52 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe4f1227a50c7a1c95768fc608a502fa6a00b300;p=thirdparty%2Fcoreutils.git pwd-unreadable-parent: Skip test on non-Linux/GNU systems. * tests/misc/pwd-unreadable-parent: Rather than trying to decide whether this test has a chance of succeeding, run it only when $(host_os) is linux-gnu. It was failing on powerpc-apple-darwin8.8.0 * tests/misc/Makefile.am (TESTS_ENVIRONMENT): Add host_os=$(host_os). --- diff --git a/ChangeLog b/ChangeLog index e95336b24c..b713a6989f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2007-03-02 Jim Meyering + pwd-unreadable-parent: Skip test on non-Linux/GNU systems. + * tests/misc/pwd-unreadable-parent: Rather than trying to decide + whether this test has a chance of succeeding, run it only when + $(host_os) is linux-gnu. It was failing on powerpc-apple-darwin8.8.0 + * tests/misc/Makefile.am (TESTS_ENVIRONMENT): Add host_os=$(host_os). + * tests/misc/pwd-long: Also allow "+" in $PWD. Remove another coreutils-ism. Formatting cleanup. diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am index 5ecd4516ff..1aa3516f8d 100644 --- a/tests/misc/Makefile.am +++ b/tests/misc/Makefile.am @@ -30,6 +30,7 @@ TESTS_ENVIRONMENT = \ PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \ CONFIG_HEADER=$(CONFIG_HEADER) \ REPLACE_GETCWD=$(REPLACE_GETCWD) \ + host_os=$(host_os) \ PROG=`../../src/basename -- "$$tst"` # Do not choose a name that is a shell keyword like 'if', or a diff --git a/tests/misc/pwd-unreadable-parent b/tests/misc/pwd-unreadable-parent index ace73f9579..801805ad7e 100755 --- a/tests/misc/pwd-unreadable-parent +++ b/tests/misc/pwd-unreadable-parent @@ -26,17 +26,9 @@ if test "$VERBOSE" = yes; then readlink --version fi -skip=1 -# Run this test IFF: -# if REPLACE_GETCWD is 0 (system getcwd is good enough) -# or HAVE_PARTLY_WORKING_GETCWD is defined -test $REPLACE_GETCWD = 0 && skip=0 -test $skip = 1 && - grep '^#define HAVE_PARTLY_WORKING_GETCWD ' $CONFIG_HEADER > /dev/null && - skip=0 -test $skip = 1 && +test $host_os != linux-gnu && { - echo 1>&2 "$0: inadequate system getcwd; skipping this test" + echo 1>&2 "$0: vendor getcwd may be inadequate; skipping this test" (exit 77); exit 77 }