[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-320-g68694a8

[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=68694a871f05fcb33a3efb6aada7c084365ca272

The branch, maint has been updated
       via  68694a871f05fcb33a3efb6aada7c084365ca272 (commit)
      from  ef95da1f6a426e26b5f6b3c219ec4d27f982ffc5 (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 68694a871f05fcb33a3efb6aada7c084365ca272
Author: Stefano Lattarini <address@hidden>
Date:   Sat Mar 5 01:57:36 2011 +0100

    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.

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

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 991ed0b..804fae6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 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-04  Stefano Lattarini  <address@hidden>
+
        tests: fix bug (comments-in-var-defn.test + autoconf 2.62)
        * tests/comments-in-var-defn.test: The configure.in stub created
        by default, which has the AC_INIT first argument obtained by the
diff --git a/tests/alloca.test b/tests/alloca.test
index 6cf51bb..8a1e06e 100755
--- a/tests/alloca.test
+++ b/tests/alloca.test
@@ -20,13 +20,21 @@
 
 set -e
 
+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 4ecd229..caf11a3 100755
--- a/tests/alloca2.test
+++ b/tests/alloca2.test
@@ -20,13 +20,21 @@
 
 set -e
 
+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