[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-254-g9b767b9

[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=9b767b916a2eda4b368e1fafbf953621327467f0

The branch, branch-1.11 has been updated
       via  9b767b916a2eda4b368e1fafbf953621327467f0 (commit)
       via  86a3c0cc4204e87fdcbb10ab716a9156510ac8c0 (commit)
       via  983a977e4575126e9be0376420b3db7856955ca8 (commit)
       via  1e1f2a13d9b97f3327e7ad0e98f0cc10b6dd490a (commit)
       via  f140b6bce15a1705ec8258e8914e7b605ef15f6f (commit)
      from  4ba7e79882444c50c0db6f54ed5a651eb5c0fc7d (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 9b767b916a2eda4b368e1fafbf953621327467f0
Merge: 4ba7e79 86a3c0c
Author: Stefano Lattarini <address@hidden>
Date:   Tue Nov 16 21:00:22 2010 +0100

    Merge branch 'maint' into branch-1.11

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

Summary of changes:
 ChangeLog         |   23 +++++++++++++++++++++++
 tests/ansi.test   |    6 ++----
 tests/colon5.test |    2 +-
 tests/colon6.test |    2 +-
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 19114d6..d19ab37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2010-11-16  Stefano Lattarini  <address@hidden>
+
+       Fix regression in colon{5,6}.test (failures on AIX 5.3).
+       * tests/colon5.test: Also substitute address@hidden@' with `$SHELL' when
+       post-processing the generated Makefile.in, to work around a bug
+       of AIX 5.3 make which doesn't allow setting the `$(SHELL)' macro
+       on the commend line.  Calls to `$MAKE' adjusted accordingly.
+       * tests/colon6.test: Likewise.
+       Regression introduced in commit v1.11-175-gf9fe878 "Modernize,
+       improve and/or extend tests `colon*.test", and reported by Ralf
+       Wildenhues.
+
+2010-11-16  Stefano Lattarini  <address@hidden>
+
+       Fix regression in ansi.test (failure on AIX 5.3).
+       * tests/ansi.test: Remove redundant hackish check done using a
+       hand-postprocessed Makefile.in.  This checs worked by setting
+       the `$(SHELL)' macro on the command line of make, but this is
+       not supported by the AIX 5.3 make implementation.
+       This bug has been lurking for a long time, and was activated by
+       commit v1.11-125-gc1f6cdb "Enable `errexit' shell flag in various
+       tests".  Report by Ralf Wildenhues.
+
 2010-11-16  Ralf Wildenhues  <address@hidden>
 
        tests: avoid '##'-style comments inside recipe commands.
diff --git a/tests/ansi.test b/tests/ansi.test
index c0778c6..7795f48 100755
--- a/tests/ansi.test
+++ b/tests/ansi.test
@@ -42,13 +42,11 @@ END
 : > ansi2knr.1
 
 $ACLOCAL
+$AUTOCONF
 $AUTOMAKE
 
-$FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed
-$MAKE -f Makefile.sed SHELL=$SHELL test1
-
-$AUTOCONF
 ./configure
+
 $MAKE test1
 $MAKE test2
 
diff --git a/tests/colon5.test b/tests/colon5.test
index c53910e..9dae9c8 100755
--- a/tests/colon5.test
+++ b/tests/colon5.test
@@ -45,7 +45,7 @@ $AUTOMAKE
 grep 'Makefile:Makefile\.in' Makefile.in
 grep '^Makefile:.* \$(srcdir)/Makefile\.dep' Makefile.in
 
-sed '/@SET_MAKE@/d' <Makefile.in >Makefile.sed
+sed -e '/@SET_MAKE@/d' -e "address@hidden@!$SHELL!g" <Makefile.in >Makefile.sed
 $MAKE -f Makefile.sed SHELL=$SHELL test
 
 :
diff --git a/tests/colon6.test b/tests/colon6.test
index 4fb738e..7c620d6 100755
--- a/tests/colon6.test
+++ b/tests/colon6.test
@@ -47,7 +47,7 @@ $AUTOMAKE
 $EGREP 'Makefile:.*(demo|version)' demo/Makefile.in && Exit 1
 grep 'version\.good:.*version\.gin' demo/Makefile.in
 
-sed '/@SET_MAKE@/d' <demo/Makefile.in >Makefile.sed
+sed -e '/@SET_MAKE@/d' -e "address@hidden@!$SHELL!g" <demo/Makefile.in 
>Makefile.sed
 $MAKE -f Makefile.sed SHELL=$SHELL test
 
 :


hooks/post-receive
-- 
GNU Automake