From: Eric Blake Date: Wed, 12 Dec 2007 21:41:53 +0000 (-0700) Subject: Fix spurious testsuite failure with M4 1.4.11. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ab69032fba864d21557af4649d0fb5352dae6c5;p=thirdparty%2Fautoconf.git 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 --- diff --git a/ChangeLog b/ChangeLog index 40e9fd52..6b6b4807 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-12-12 Eric Blake + + 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 * tests/m4sugar.at (m4_warn, m4_require: circular dependencies): diff --git a/tests/local.at b/tests/local.at index 0ac5d643..be827d9b 100644 --- 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]*)$//