summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--tests/misc/Makefile.am1
-rwxr-xr-xtests/misc/pwd-unreadable-parent5
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ffa3014a..e26e27f95 100644
--- 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 425d6e368..437285075 100644
--- 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 35d4f1816..ace73f957 100755
--- 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