* tests/defs.in: Rename $curdir to $testbuildir, for clarity and
consistency with $testsrcdir and $top_testsrcdir.
---
ChangeLog |4
tests/defs.in | 14 +++---
2 files changed, 11 insertions(+), 7 deletions(-)
From ddc690b22264d5c6213ea89ef451c0c2bdec02c0 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Fri, 5 Nov 2010 17:23:31 +0100
Subject: [PATCH 3/7] Tests defs: rename $curdir -> $testbuilddir
* tests/defs.in: Rename $curdir to $testbuildir, for clarity and
consistency with $testsrcdir and $top_testsrcdir.
---
ChangeLog |4
tests/defs.in | 14 +++---
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0a5f849..8e1591e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2010-11-06 Stefano Lattarini
+ Tests defs: rename $curdir -> $testbuilddir
+ * tests/defs.in: Rename $curdir to $testbuildir, for clarity and
+ consistency with $testsrcdir and $top_testsrcdir.
+
Tests defs: prefer "$curdir" over "`pwd`".
* 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 700365d..caea225 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -102,10 +102,10 @@ sleep='sleep @MODIFICATION_DELAY@'
old_timestamp=198309271735.59
# Absolute path of the testsuite buildir.
-curdir=`pwd`
+testbuilddir=`pwd`
# Make our wrapper scripts accessible by default.
-PATH="$curdir$PATH_SEPARATOR$PATH"; export PATH
+PATH="$testbuilddir$PATH_SEPARATOR$PATH"; export PATH
## ##
@@ -395,10 +395,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 further
-# 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
+# further 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"
@@ -429,7 +429,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
