* tests/defs.in: Rename $curdir to $testbuildir, for clarity and
consistency with $testsrcidr and $top_testsrcdir.
---
ChangeLog | 4 ++++
tests/defs.in | 14 +++++++-------
2 files changed, 11 insertions(+), 7 deletions(-)
From 0c2940be6ecd0ae395a966b738b1e0e98d4b597b Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Wed, 8 Sep 2010 17:21:00 +0200
Subject: [PATCH 3/5] Tests defs: rename $curdir -> $testbuilddir
* tests/defs.in: Rename $curdir to $testbuildir, for clarity and
consistency with $testsrcidr and $top_testsrcdir.
---
ChangeLog | 4 ++++
tests/defs.in | 14 +++++++-------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cf4c783..4cbabd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2010-09-08 Stefano Lattarini <stefano.lattar...@gmail.com>
+ Tests defs: rename $curdir -> $testsbuilddir
+ * tests/defs.in: Rename $curdir to $testbuildir, for clarity and
+ consistency with $testsrcidr and $top_testsrcdir.
+
Tests defs: prefer "$curdir" over "`pwd`", where possible.
* tests/defs.in: We already save the value of `pwd` in $curdir
early in the file, so there no need to recalculate it later, when
diff --git a/tests/defs.in b/tests/defs.in
index 9991741..12a082f 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -51,7 +51,7 @@ fi
echo "=== Running test $0"
-curdir=`pwd`
+testbuilddir=`pwd`
# The name of the current test (without the `.test' suffix.)
me=`echo "$0" | sed -e 's,.*[\\/],,;s/\.test$//'`
@@ -116,7 +116,7 @@ sleep='sleep @MODIFICATION_DELAY@'
old_timestamp=198309271735.59
# Make our wrapper scripts accessible by default.
-PATH="$cur...@path_separator@$PATH"
+PATH="$testbuild...@path_separator@$PATH"
# Some shells forget to export modified environment variables.
# (See note about `export' in the Autoconf manual.)
export PATH
@@ -391,10 +391,10 @@ case " $required " in
esac
# Libtool cannot cope with spaces in the build tree. Our testsuite setup
# cannot cope with spaces in the source tree name for Libtool and gettext
- # tests. Using just `$curdir' for the check here is ok, since the furter
- # temporary subdirectory where the test will be run is ensured not to
- # contain any space.
- case $testsrcdir,$curdir in
+ # tests. Using just `$testbuilddir' for the check here is ok, since the
+ # furter temporary subdirectory where the test will be run is ensured not
+ # to contain any space.
+ case $testsrcdir,$testbuilddir in
*\ * | *\ *) exit 77;;
esac
ACLOCAL="$ACLOCAL -Wno-syntax -I $top_testsrcdir/m4 $extra_includes -I $aclocaldir"
@@ -425,7 +425,7 @@ sh_errexit_wor...@sh_errexit_works@
if test "$sh_errexit_works" = yes; then
trap 'exit_status=$?
set +e
- cd "$curdir"
+ cd "$testbuilddir"
case $exit_status,$keep_testdirs in
0,)
find $testSubDir -type d ! -perm -200 -exec chmod u+w {} ";"
--
1.7.1
