Don't skip this test on new-enough Linux/GNU systems.

* tests/misc/pwd-unreadable-parent: Test $REPLACE_GETCWD = 0,
rather than for __GETCWD_PREFIX in config.h (the latter is no
longer defined, ever, due to gnulib changes).
* tests/misc/Makefile.am (TESTS_ENVIRONMENT): Define REPLACE_GETCWD.

diff --git a/ChangeLog b/ChangeLog
index 1ffa3014a893770877c8ed5ad62ded7e986d99a7..e26e27f95d8028a7a1a87d6e8d05916605d56ed7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-02-24  Jim Meyering  <jim@meyering.net>
 
+       Don't skip this test on new-enough Linux/GNU systems.
+       * tests/misc/pwd-unreadable-parent: Test $REPLACE_GETCWD = 0,
+       rather than for __GETCWD_PREFIX in config.h (the latter is no
+       longer defined, ever, due to gnulib changes).
+       * tests/misc/Makefile.am (TESTS_ENVIRONMENT): Define REPLACE_GETCWD.
+
        Remove the "gnits" option; it prohibits my using "+" as a version
        string suffix, and all it does (beyond the default "gnu" option)
        is to _require_ the THANKS file.

diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am
index 425d6e3685e558021df9cfeacf5d9c7dc90e56ff..4372850754a70fbad82002f6ab2c7858b012d5c9 100644 (file)
--- a/tests/misc/Makefile.am
+++ b/tests/misc/Makefile.am
@@ -29,6 +29,7 @@ TESTS_ENVIRONMENT = \
   CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
   PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   CONFIG_HEADER=$(CONFIG_HEADER) \
+  REPLACE_GETCWD=$(REPLACE_GETCWD) \
   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 35d4f18163e2f869469e289ea9267dc30ca39c9b..ace73f957977c97f4a212812a338476efa5b114f 100755 (executable)
--- a/tests/misc/pwd-unreadable-parent
+++ b/tests/misc/pwd-unreadable-parent
@@ -28,10 +28,9 @@ fi
 
 skip=1
 # Run this test IFF:
-# if __GETCWD_PREFIX is not defined (system getcwd is good enough)
+# if REPLACE_GETCWD is 0 (system getcwd is good enough)
 #   or HAVE_PARTLY_WORKING_GETCWD is defined
-grep '^/\* #undef __GETCWD_PREFIX ' $CONFIG_HEADER > /dev/null &&
-  skip=0
+test $REPLACE_GETCWD = 0 && skip=0
 test $skip = 1 &&
   grep '^#define HAVE_PARTLY_WORKING_GETCWD ' $CONFIG_HEADER > /dev/null &&
     skip=0