summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2012-07-01 11:50:54 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2012-07-01 11:50:54 +0200
commit0a442c188817b16482373253d729b7a4ec8f7fd9 (patch)
treeb44d7dc8de3b0f6c6e676dd58593e2e8b98ff721
parent285eed2fadec7f8949f10d60ef138c56e25ac565 (diff)
downloadautomake-0a442c188817b16482373253d729b7a4ec8f7fd9.tar.gz
tests setup: unset CDPATH
So that our test scripts can safely chdir around using relative paths as well, without having to worry abut possible CDPATH interferences. * defs-static.in: unset CDPATH. * t/ax/tests-init.sh: Remove a now-unneeded workaround. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
-rw-r--r--defs-static.in3
-rw-r--r--t/ax/test-init.sh3
2 files changed, 4 insertions, 2 deletions
diff --git a/defs-static.in b/defs-static.in
index a1878cca2..69012128a 100644
--- a/defs-static.in
+++ b/defs-static.in
@@ -25,6 +25,9 @@
# shell, not only with configure-time detected $SHELL and/or
# $AM_TEST_RUNNER_SHELL.
+# CDPATH is evil if exported in the environment.
+CDPATH=; unset CDPATH
+
# Be more Bourne compatible.
# (Snippet inspired to configure's initialization in Autoconf 2.64)
DUALCASE=1; export DUALCASE # for MKS sh
diff --git a/t/ax/test-init.sh b/t/ax/test-init.sh
index c6d2abdb4..e038c5b5a 100644
--- a/t/ax/test-init.sh
+++ b/t/ax/test-init.sh
@@ -992,8 +992,7 @@ else
|| framework_failure_ "removing old test subdirectory"
$MKDIR_P $am_test_subdir \
|| framework_failure_ "creating test subdirectory"
- # The leading './' is to avoid CDPATH issues.
- cd ./$am_test_subdir \
+ cd $am_test_subdir \
|| framework_failure_ "cannot chdir into test subdirectory"
if test x"$am_create_testdir" != x"empty"; then
cp "$am_scriptdir"/install-sh "$am_scriptdir"/missing \