From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 5 Mar 2011 00:57:36 +0000 (+0100)
Subject: tests: fix bug in alloca*.test
X-Git-Tag: ng-0.5a~223^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68694a871f05fcb33a3efb6aada7c084365ca272;p=thirdparty%2Fautomake.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 991ed0bb8..804fae6f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2011-03-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	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  <stefano.lattarini@gmail.com>
 
 	tests: fix bug (comments-in-var-defn.test + autoconf 2.62)
diff --git a/tests/alloca.test b/tests/alloca.test
index 6cf51bb53..8a1e06e37 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 4ecd229f4..caf11a34d 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
+
+: