Testsuite: new vars `$PATH_SEPARATOR' and `$APIVERSION'.

* tests/defs.in ($APIVERSION):  New AC_SUBST'd variable.
($ACLOCAL, $AUTOMAKE): Use it.
($PATH_SEPARATOR):  New AC_SUBST'd variables.
($PATH): Use it.

diff --git a/ChangeLog b/ChangeLog
index 43d19963046c6202a876faf9df16115eefab8758..b96918c93e8848bf0f6afbeb97523bf121e21423 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-25  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       Testsuite: new variables `$PATH_SEPARATOR' and `$APIVERSION'.
+       * tests/defs.in ($APIVERSION):  New AC_SUBST'd variable.
+       ($ACLOCAL, $AUTOMAKE): Use it.
+       ($PATH_SEPARATOR):  New AC_SUBST'd variables.
+       ($PATH): Use it.
+
 2010-09-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        Manual: be more agnostic w.r.t. version control system used.

diff --git a/tests/defs.in b/tests/defs.in
index 1744a07f56cf7022bfa37f5ccdfb61671c9ad386..ee19dbe9a1aa598eb546d0b85ddbb9321422c587 100644 (file)
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -54,6 +54,9 @@ test -f "$srcdir/defs.in" || {
 
 me=`echo "$0" | sed -e 's,.*[\\/],,;s/\.test$//'`
 
+APIVERSION='@APIVERSION@'
+PATH_SEPARATOR='@PATH_SEPARATOR@'
+
 # Make sure we override the user shell.
 SHELL='@SHELL@'
 export SHELL
@@ -66,7 +69,7 @@ test -z "$AUTOUPDATE" && AUTOUPDATE=autoupdate
 test -z "$MISSING" && MISSING=`pwd`/../lib/missing
 # Use -Werror because this also turns some Perl warnings into error.
 # (Tests for which this is inappropriate should use -Wno-error.)
-test -z "$ACLOCAL" && ACLOCAL="aclocal-@APIVERSION@ -Werror"
+test -z "$ACLOCAL" && ACLOCAL="aclocal-$APIVERSION -Werror"
 # Extra flags to pass to aclocal before all other flags added by this script.
 ACLOCAL_TESTSUITE_FLAGS=
 export ACLOCAL_TESTSUITE_FLAGS
@@ -77,9 +80,9 @@ export ACLOCAL_TESTSUITE_FLAGS
 # -Werror by default.  Tests for which this is inappropriate
 # (e.g. when testing that a warning is enabled by a specific switch)
 # should use -Wnone or/and -Wno-error
-test -z "$AUTOMAKE" && AUTOMAKE="automake-@APIVERSION@ --foreign -Werror -Wall"
+test -z "$AUTOMAKE" && AUTOMAKE="automake-$APIVERSION --foreign -Werror -Wall"
 
-PATH="`pwd`@PATH_SEPARATOR@$PATH"
+PATH="`pwd`$PATH_SEPARATOR$PATH"
 echo "$PATH"
 # Some shells forget to export modified environment variables.
 # (See note about `export' in the Autoconf manual.)