From: Jim Meyering Date: Mon, 12 Feb 2007 00:20:20 +0000 (+0100) Subject: * tests/misc/pwd-unreadable-parent: Skip the test if we're X-Git-Tag: COREUTILS-6_8~38 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e152d05d8211444850e83e4e403a510f00f55027;p=thirdparty%2Fcoreutils.git * tests/misc/pwd-unreadable-parent: Skip the test if we're definitely using the replacement. * tests/misc/Makefile.am (TESTS_ENVIRONMENT): Define CONFIG_HEADER. --- diff --git a/ChangeLog b/ChangeLog index f0b7712abe..a2f6376d11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-02-12 Jim Meyering + + * tests/misc/pwd-unreadable-parent: Skip the test if we're + definitely using the replacement. + * tests/misc/Makefile.am (TESTS_ENVIRONMENT): Define CONFIG_HEADER. + 2007-02-10 Jim Meyering Remove excess leading spaces that would make help2man misbehave. diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am index 145afbe0c0..425d6e3685 100644 --- a/tests/misc/Makefile.am +++ b/tests/misc/Makefile.am @@ -28,6 +28,7 @@ TESTS_ENVIRONMENT = \ BUILD_SRC_DIR="`pwd`/../../src" \ CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \ PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \ + CONFIG_HEADER=$(CONFIG_HEADER) \ 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 f84627ec49..35d4f18163 100755 --- a/tests/misc/pwd-unreadable-parent +++ b/tests/misc/pwd-unreadable-parent @@ -26,6 +26,21 @@ if test "$VERBOSE" = yes; then readlink --version fi +skip=1 +# Run this test IFF: +# if __GETCWD_PREFIX is not defined (system getcwd is good enough) +# or HAVE_PARTLY_WORKING_GETCWD is defined +grep '^/\* #undef __GETCWD_PREFIX ' $CONFIG_HEADER > /dev/null && + skip=0 +test $skip = 1 && + grep '^#define HAVE_PARTLY_WORKING_GETCWD ' $CONFIG_HEADER > /dev/null && + skip=0 +test $skip = 1 && + { + echo 1>&2 "$0: inadequate system getcwd; skipping this test" + (exit 77); exit 77 + } + pwd=`pwd` t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$ trap 'status=$?; cd "$pwd" && chmod -R u+rwx $t0 && rm -rf $t0 && exit $status' 0