[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-724-g5d2a076

[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=5d2a076684b303de8f7ad14506e23d251ce3e5d0

The branch, master has been updated
       via  5d2a076684b303de8f7ad14506e23d251ce3e5d0 (commit)
       via  68694a871f05fcb33a3efb6aada7c084365ca272 (commit)
      from  3c5d9e8f2d52ee108d6d8d885ce8856da8021917 (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 5d2a076684b303de8f7ad14506e23d251ce3e5d0
Merge: 3c5d9e8 68694a8
Author: Stefano Lattarini <address@hidden>
Date:   Thu Mar 17 23:31:48 2011 +0100

    Merge branch 'maint'

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

Summary of changes:
 ChangeLog          |   13 +++++++++++++
 tests/alloca.test  |   12 ++++++++++--
 tests/alloca2.test |   12 ++++++++++--
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f295558..a594525 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2011-03-04  Stefano Lattarini  <address@hidden>
+
+       tests: fix bug in alloca*.test
+       * tests/alloca.test: Make grepping of automake stderr stricter,
+       add a trailing `:' command; also, add AC_PROG_CC to configure.in,
+       and create a dummy alloca.c file, to ensure that we fail for the
+       proper reason.
+       * tests/alloca2.test: Likewise.  Also, look for LT_INIT, not
+       AC_PROG_LIBTOOL, in the error message (bug introduced with commit
+       v1.11-315-gd51e7b7 "libtool: suggest LT_INIT if LTLIBRARIES
+       primary is used").
+       From a report by Patrick Welche.
+
 2011-03-17  Stefano Lattarini  <address@hidden>
 
        cosmetics: better use of m4 quoting and m4sugar macros
diff --git a/tests/alloca.test b/tests/alloca.test
index bbf452f..cff6641 100755
--- a/tests/alloca.test
+++ b/tests/alloca.test
@@ -18,13 +18,21 @@
 
 . ./defs || Exit 1
 
+cat >> configure.in <<'END'
+AC_PROG_CC
+END
+
 cat > Makefile.am << 'END'
 noinst_LIBRARIES = libtu.a
 libtu_a_SOURCES =
 libtu_a_LIBADD = @ALLOCA@
 END
 
+: > alloca.c
+
 $ACLOCAL
 AUTOMAKE_fails
-grep 'Makefile.am:1:.*AC_PROG_RANLIB' stderr
-grep 'Makefile.am:3:.*AC_FUNC_ALLOCA' stderr
+grep '^Makefile\.am:1:.*define .*RANLIB.* add .*AC_PROG_RANLIB' stderr
+grep '^Makefile\.am:3:.*define .*ALLOCA.* add .*AC_FUNC_ALLOCA' stderr
+
+:
diff --git a/tests/alloca2.test b/tests/alloca2.test
index 9976f3f..8ebdcd7 100755
--- a/tests/alloca2.test
+++ b/tests/alloca2.test
@@ -18,13 +18,21 @@
 
 . ./defs || Exit 1
 
+cat >> configure.in <<'END'
+AC_PROG_CC
+END
+
 cat > Makefile.am << 'END'
 noinst_LTLIBRARIES = libtu.la
 libtu_la_SOURCES =
 libtu_la_LIBADD = @LTALLOCA@
 END
 
+: > alloca.c
+
 $ACLOCAL
 AUTOMAKE_fails
-grep 'Makefile.am:1:.*AC_PROG_LIBTOOL' stderr
-grep 'Makefile.am:3:.*ALLOCA' stderr
+grep '^Makefile\.am:1:.*define.*LIBTOOL.* add .*LT_INIT' stderr
+grep '^Makefile\.am:3:.*LTALLOCA' stderr
+
+:


hooks/post-receive
-- 
GNU Automake