testsuite failure with m4 1.4.11

[Eric Blake]

The latest git m4 warning/error messages have changed to consistently list the 
macro name responsible for issuing the message.  As a result, test 3 (autom4te 
cache) had a spurious failure.  I'm seeing other failures on cygwin following 
the whitespace improvement checks; I'll address those once I get to root cause.

It's looking like it will be 2008 before I have enough free time to release M4 
1.4.11, with its quadratic->linear speedup of recursive algorithms.

From: Eric Blake <address@hidden>
Date: Wed, 12 Dec 2007 14:41:53 -0700
Subject: [PATCH] Fix spurious testsuite failure with to M4 1.4.11.

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

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog      |    3 +++
 tests/local.at |   11 +++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 77f8360..bcf598a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-12-12  Eric Blake  <address@hidden>
 
+       Fix spurious testsuite failure with M4 1.4.11.
+       * tests/local.at (AT_CHECK_M4): Cater to new m4 error message.
+
        Optimize AC_REQUIRE.
        * lib/m4sugar/m4sugar.m4 (m4_expansion_stack_push, _m4_defun_pro)
        (_m4_defun_pro_outer, _m4_defun_epi, _m4_defun_epi_outer)
diff --git a/tests/local.at b/tests/local.at
index 855ebd3..9caac75 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -63,11 +63,16 @@ m4_define([AT_CHECK_PERL_SYNTAX],
 # AT_CHECK_M4(COMMAND, [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
@@ -86,6 +91,7 @@ m4_define([AT_CHECK_PERL_SYNTAX],
 #
 # and
 #     m4:(file):(line): Cannot open foo:
+# or  m4:(file):(line): include: cannot open `foo':
 # to  m4:(file):(line): cannot open `foo':
 #
 # and
@@ -102,7 +108,8 @@ m4_define([AT_CHECK_M4],
 m4_case([$4], [], [], [ignore], [],
 [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]*)$//
-- 
1.5.3.5