[PATCH] {maint} tests: fix bug in alloca*.test (was: Re: alloca2 test)

[Stefano Lattarini]

Hello Patrick, and thanks for the report.

On Friday 04 March 2011, Patrick Welche wrote:
> alloca2.test has
> 
> grep 'Makefile.am:1:.*AC_PROG_LIBTOOL' stderr
> 
> but I think that nowadays LT_INIT is what appears in automake's error
> message about lack of libtool?
>
You're right.  The testcase is in fact failing spuriously.  What about
the attached patch?  It fixes the new spurious failure, and add a couple
of improvements to the `alloca*.test' tests.

I will push in 72 hours if there is no objection.

Thanks,
  Stefano

From 68694a871f05fcb33a3efb6aada7c084365ca272 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Sat, 5 Mar 2011 01:57:36 +0100
Subject: [PATCH] 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.
---
 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
+
+:
-- 
1.7.2.3