From: Eric Blake <ebb9@byu.net>
Date: Sat, 3 Nov 2007 14:44:44 +0000 (-0600)
Subject: Support m4 1.4.5 in testsuite.
X-Git-Tag: v2.62~172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8248eff79e6ee4c229616263d537c4e870e34671;p=thirdparty%2Fautoconf.git

Support m4 1.4.5 in testsuite.

* tests/torture.at (Define a newline): Exclude line numbers in
error message.
Reported by Ralf Wildenhues.

Signed-off-by: Eric Blake <ebb9@byu.net>
---

diff --git a/ChangeLog b/ChangeLog
index 42ce31ca..a98e2103 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-03  Eric Blake  <ebb9@byu.net>
+
+	Support m4 1.4.5 in testsuite.
+	* tests/torture.at (Define a newline): Exclude line numbers in
+	error message.
+	Reported by Ralf Wildenhues.
+
 2007-11-03  Jim Meyering  <meyering@redhat.com>
 
 	Remove automake-provided files from version control.
diff --git a/tests/torture.at b/tests/torture.at
index d537eb97..354deee2 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -766,13 +766,17 @@ AT_SETUP([Define a newline])
 AT_CONFIGURE_AC([[AC_DEFINE([foo], [one
 two], [This spans two lines.])
 ]])
-AT_CHECK_AUTOCONF([], [], [],
-[[configure.ac:5: warning: AC_DEFINE: `one
-configure.ac:5: two' is not a valid preprocessor define value
+AT_CHECK_AUTOCONF([], [], [], [stderr])
+dnl Older versions of m4 report error at line 6 (end of macro);
+dnl newer versions report it at line 5 (start of macro).
+AT_CHECK([[sed 's/^configure.ac:[56]: //' stderr]], [],
+[[warning: AC_DEFINE: `one
+two' is not a valid preprocessor define value
 ]])
-AT_CHECK_AUTOHEADER([], [], [],
-[[configure.ac:5: warning: AC_DEFINE: `one
-configure.ac:5: two' is not a valid preprocessor define value
+AT_CHECK_AUTOHEADER([], [], [], [stderr])
+AT_CHECK([[sed 's/^configure.ac:[56]: //' stderr]], [],
+[[warning: AC_DEFINE: `one
+two' is not a valid preprocessor define value
 ]])
 AT_CHECK_CONFIGURE
 AT_CHECK_DEFINES([[#define foo one
@@ -781,13 +785,15 @@ AT_CHECK_DEFINES([[#define foo one
 AT_CONFIGURE_AC([[AC_DEFINE_UNQUOTED([foo], [one
 two], [This spans two lines.])
 ]])
-AT_CHECK_AUTOCONF([], [], [],
-[[configure.ac:5: warning: AC_DEFINE_UNQUOTED: `one
-configure.ac:5: two' is not a valid preprocessor define value
+AT_CHECK_AUTOCONF([], [], [], [stderr])
+AT_CHECK([[sed 's/^configure.ac:[56]: //' stderr]], [],
+[[warning: AC_DEFINE_UNQUOTED: `one
+two' is not a valid preprocessor define value
 ]])
-AT_CHECK_AUTOHEADER([], [], [],
-[[configure.ac:5: warning: AC_DEFINE_UNQUOTED: `one
-configure.ac:5: two' is not a valid preprocessor define value
+AT_CHECK_AUTOHEADER([], [], [], [stderr])
+AT_CHECK([[sed 's/^configure.ac:[56]: //' stderr]], [],
+[[warning: AC_DEFINE_UNQUOTED: `one
+two' is not a valid preprocessor define value
 ]])
 AT_CHECK_CONFIGURE
 AT_CHECK_DEFINES([[#define foo one