[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-209-g067455c

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=067455ce40bfa4c7234d46368ab64efb893ab808

The branch, maint has been updated
       via  067455ce40bfa4c7234d46368ab64efb893ab808 (commit)
      from  6bc306097ad74dfafd445243f69a13bda2139505 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 067455ce40bfa4c7234d46368ab64efb893ab808
Author: Stefano Lattarini <address@hidden>
Date:   Sat Sep 25 16:53:13 2010 +0200

    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.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog     |    8 ++++++++
 tests/defs.in |    9 ++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 43d1996..b96918c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-25  Stefano Lattarini  <address@hidden>
+
+       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  <address@hidden>
 
        Manual: be more agnostic w.r.t. version control system used.
diff --git a/tests/defs.in b/tests/defs.in
index 1744a07..ee19dbe 100644
--- 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="address@hidden@ -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="address@hidden@ --foreign -Werror -Wall"
+test -z "$AUTOMAKE" && AUTOMAKE="automake-$APIVERSION --foreign -Werror -Wall"
 
-PATH="address@hidden@$PATH"
+PATH="`pwd`$PATH_SEPARATOR$PATH"
 echo "$PATH"
 # Some shells forget to export modified environment variables.
 # (See note about `export' in the Autoconf manual.)


hooks/post-receive
-- 
GNU Automake