[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-1285-gd6c6054

[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=d6c60545ff41d153152c5a542cf723fd163c65ee

The branch, testsuite-work has been updated
       via  d6c60545ff41d153152c5a542cf723fd163c65ee (commit)
       via  7ce19f110c1420531ff39a97ce710bad972f776d (commit)
       via  e25ee5889f3fdf9890e4a141e1c27d6a063b2ad9 (commit)
      from  d61c64c131b2ac809e7470beac7b48c64c797049 (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 d6c60545ff41d153152c5a542cf723fd163c65ee
Merge: d61c64c 7ce19f1
Author: Stefano Lattarini <address@hidden>
Date:   Fri Sep 2 21:58:54 2011 +0200

    Merge branch 'master' into testsuite-work
    
    * master:
      tests: simplify wrapper for aclocal

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

Summary of changes:
 ChangeLog            |   11 +++++++++++
 tests/acloca10.test  |    5 ++---
 tests/acloca18.test  |   20 +++++++-------------
 tests/aclocal.in     |    3 +--
 tests/defs-static.in |    2 --
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 92914b7..58ec84f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2011-09-02  Stefano Lattarini  <address@hidden>
 
+       tests: simplify wrapper for aclocal
+       * tests/aclocal.in: Remove use of $ACLOCAL_TESTSUITE_FLAGS and
+       extra `-I' flags; they are not really required, since the file
+       `m4/amversion.m4' is generated in the srcdir anyway.
+       * tests/acloca10.test: Remove use of $ACLOCAL_TESTSUITE_FLAGS.
+       * tests/acloca18.test: Likewise.
+       * tests/defs.in: Don't nullify $ACLOCAL_TESTSUITE_FLAGS, and do
+       not export it.
+
+2011-09-02  Stefano Lattarini  <address@hidden>
+
        tests: remove redundant settings of `errexit' shell flag
        * doc-parsing-buglets-colneq-subst.test: Do not set the
        `errexit' shell flag, as it is already set by `tests/defs'.
diff --git a/tests/acloca10.test b/tests/acloca10.test
index 2501d51..df7da0e 100755
--- a/tests/acloca10.test
+++ b/tests/acloca10.test
@@ -65,8 +65,7 @@ test ! -f m4_1/macro.m4
 test ! -f m4_2/macro.m4
 
 $sleep
-ACLOCAL_TESTSUITE_FLAGS='-I m4_1 -I m4_2'
-$ACLOCAL --install
+$ACLOCAL -I m4_1 -I m4_2 --install
 $AUTOCONF
 ./configure
 grep macro11 foo
@@ -79,7 +78,7 @@ cp aclocal.m4 copy.m4
 
 $sleep
 echo '#GREPME' >>dirlist-test/macro.m4
-$ACLOCAL --install
+$ACLOCAL -I m4_1 -I m4_2 --install
 $AUTOCONF
 ./configure
 grep macro11 foo
diff --git a/tests/acloca18.test b/tests/acloca18.test
index 2b26d3f..a7a6e2e 100755
--- a/tests/acloca18.test
+++ b/tests/acloca18.test
@@ -64,9 +64,7 @@ AC_DEFUN([AM_MACRO1], [echo macro16 >> foo])
 #serial 1
 EOF
 
-ACLOCAL_TESTSUITE_FLAGS='-I 1 -I 2 -I 3 -I 4'
-
-$ACLOCAL
+$ACLOCAL -I 1 -I 2 -I 3 -I 4
 $AUTOCONF
 ./configure
 grep macro11 foo
@@ -74,16 +72,15 @@ grep macro21 foo
 
 $sleep
 rm -f foo
-$ACLOCAL --install
+$ACLOCAL  -I 1 -I 2 -I 3 -I 4 --install
 $AUTOCONF
 ./configure
 grep macro12 foo
 grep macro23 foo
 
 $sleep
-ACLOCAL_TESTSUITE_FLAGS='-I 4 -I 1 -I 2 -I 3'
 rm -f foo
-$ACLOCAL --install --dry-run
+$ACLOCAL -I 4 -I 1 -I 2 -I 3 --install --dry-run
 $AUTOCONF
 ./configure
 grep macro12 foo
@@ -91,29 +88,26 @@ grep macro23 foo
 
 $sleep
 rm -f foo
-$ACLOCAL --install
+$ACLOCAL -I 4 -I 1 -I 2 -I 3 --install
 $AUTOCONF
 ./configure
 grep macro14 foo
 grep macro23 foo
 
 $sleep
-ACLOCAL_TESTSUITE_FLAGS='-I 4 -I 1 -I 2'
 rm -f foo
-$ACLOCAL --install 2>stderr && { cat stderr >&2; Exit 1; }
+$ACLOCAL -I 4 -I 1 -I 2 --install 2>stderr && { cat stderr >&2; Exit 1; }
 cat stderr >&2
 grep 'macro.*AM_MACRO2.*not found' stderr
 
 $sleep
-ACLOCAL_TESTSUITE_FLAGS='-I 4 -I 1'
 rm -f foo
-$ACLOCAL --install
+$ACLOCAL -I 4 -I 1 --install
 $AUTOCONF
 ./configure
 grep macro14 foo
 grep macro21 foo
 
-
 $sleep
 mkdir dirlist-test
 cat >dirlist-test/m1.m4 <<EOF
@@ -122,7 +116,7 @@ AC_DEFUN([AM_MACRO1], [echo macro1d >> foo])
 AC_DEFUN([AM_MACRO2], [echo macro2d >> foo])
 EOF
 rm -f foo
-$ACLOCAL --diff=diff >stdout 2>stderr || {
+$ACLOCAL -I 4 -I 1 --diff=diff >stdout 2>stderr || {
   cat stderr >&2
   cat stdout
   Exit 1
diff --git a/tests/aclocal.in b/tests/aclocal.in
index 35b1619..f8aa1a7 100644
--- a/tests/aclocal.in
+++ b/tests/aclocal.in
@@ -14,5 +14,4 @@ 
perllibdir="@abs_top_builddir@/address@hidden@@abs_top_srcdir@/lib"
 export perllibdir
 # Most of the files are in $srcdir/../m4.  However amversion.m4 is
 # generated in ../m4, so we include that directory in the search path too.
-exec "@abs_top_builddir@/aclocal" $ACLOCAL_TESTSUITE_FLAGS \
-     -I "@abs_top_builddir@/m4" "address@hidden@/m4" ${1+"$@"}
+exec "@abs_top_builddir@/aclocal" "address@hidden@/m4" ${1+"$@"}
diff --git a/tests/defs-static.in b/tests/defs-static.in
index 9f7504e..532b0a8 100644
--- a/tests/defs-static.in
+++ b/tests/defs-static.in
@@ -129,8 +129,6 @@ if test -z "$original_ACLOCAL"; then
   original_ACLOCAL=${ACLOCAL-"aclocal-$APIVERSION"}
 fi
 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
 
 # See how Automake should be run.  We put --foreign as the default
 # strictness to avoid having to create lots and lots of files.  A test


hooks/post-receive
-- 
GNU Automake