Fix spurious testsuite failure with M4 1.4.11.

* tests/local.at (AT_CHECK_M4): Cater to new m4 error message.

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

diff --git a/ChangeLog b/ChangeLog
index 40e9fd522fa3ce72a7342500b983b17c7c646e30..6b6b4807aa5cc63e31d754d76cc9e1c9299b59ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-12  Eric Blake  <ebb9@byu.net>
+
+       Fix spurious testsuite failure with M4 1.4.11.
+       * tests/local.at (AT_CHECK_M4): Cater to new m4 error message.
+
 2006-10-26  Eric Blake  <ebb9@byu.net>
 
        * tests/m4sugar.at (m4_warn, m4_require: circular dependencies):

diff --git a/tests/local.at b/tests/local.at
index 0ac5d6435b631f95882b940e7158c85caf26af09..be827d9bcf32edef3483a1084c86fe7fa03f17cb 100644 (file)
--- a/tests/local.at
+++ b/tests/local.at
@@ -34,11 +34,16 @@ AT_TESTED([autom4te autoconf autoheader autoupdate autoreconf ifnames])
 # AT_CHECK_AUTOM4TE(FLAGS, [EXIT-STATUS = 0], STDOUT, STDERR)
 # -----------------------------------------------------------
 # If stderr is specified, normalize the observed stderr.
-# This (using GNU M4 1.4.6 or later)
+# This (using GNU M4 1.4.6)
 #
 #  /usr/local/bin/m4:script.4s:1: cannot open `foo': No such file or directory
 #  autom4te: /usr/local/bin/m4 failed with exit status: 1
 #
+# or this (GNU M4 1.4.11)
+#
+#  /usr/local/bin/m4:script.4s:1: include: cannot open `foo': No such file or directory
+#  autom4te: /usr/local/bin/m4 failed with exit status: 1
+#
 # or this (GNU M4 1.4 installed as gm4)
 #
 #  script.4s:1: /usr/local/bin/gm4: Cannot open foo: No such file or directory
@@ -57,6 +62,7 @@ AT_TESTED([autom4te autoconf autoheader autoupdate autoreconf ifnames])
 #
 # and
 #     m4:(file):(line): Cannot open foo:
+# or  m4:(file):(line): include: cannot open `foo':
 # to  m4:(file):(line): cannot open `foo':
 #
 # and
@@ -67,7 +73,8 @@ m4_define([AT_CHECK_AUTOM4TE],
 m4_ifval([$4],
 [AT_CHECK([[sed 's/^[^:]*m4: *\([^:]*:\) *\([0-9][0-9]*: \)/m4:\1\2/
        s/^\([^:]*:\) *\([0-9][0-9]*:\)[^:]*m4: /m4:\1\2 /
-       s/^\(m4:[^:]*:[0-9][0-9]*: \)C\(annot open \)\([^`:]*\):/\1c\2`\3'\'':/
+       s/: C\(annot open \)\([^`:]*\):/: c\1`\2'\'':/
+       s/: include:\( cannot open\)/:\1/
        s/^autom4te: [^ ]*m4 /autom4te: m4 /
        s/^autom4te: [^ ]*m4\.exe /autom4te: m4 /
        s/ (E[A-Z]*)$//