From: Ralf Wildenhues Date: Tue, 10 Aug 2010 20:45:19 +0000 (+0200) Subject: Fix testsuite failures with typical m4-x.y.z program suffix. X-Git-Tag: v2.68~65 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87010b725a3dca5aa2d8a6367944766bfbb7d9a1;p=thirdparty%2Fautoconf.git Fix testsuite failures with typical m4-x.y.z program suffix. * tests/local.at (AT_CHECK_M4): Normalize hyphens and digits after the `m4' program name. * THANKS: Update. Report by Luke Dalessandro. Signed-off-by: Ralf Wildenhues --- diff --git a/ChangeLog b/ChangeLog index 87768b8c..686924cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-08-10 Ralf Wildenhues + + Fix testsuite failures with typical m4-x.y.z program suffix. + * tests/local.at (AT_CHECK_M4): Normalize hyphens and digits + after the `m4' program name. + * THANKS: Update. + Report by Luke Dalessandro. + 2010-08-06 Ralf Wildenhues Fix description of AC_CONFIG_TESTDIR to not mention atconfig.in. diff --git a/THANKS b/THANKS index fc5a9b75..e26eb88f 100644 --- a/THANKS +++ b/THANKS @@ -234,6 +234,7 @@ Laurence Darbe ldarby@tuffmail.com Leo Moisio leo.moisio@gmail.com Loulou Pouchet loulou@lrde.epita.fr Ludovic Courtes ? +Luke Dalessandro luked@cs.rochester.edu Magnus Therning therning@gforge.natlab.research.philips.com Manu manubee@wanadoo.fr Marc Espie Marc.Espie@liafa.jussieu.fr diff --git a/tests/local.at b/tests/local.at index 39360ef7..d1a48906 100644 --- a/tests/local.at +++ b/tests/local.at @@ -80,6 +80,11 @@ m4_define([AT_CHECK_PERL_SYNTAX], # script.4s:1: /usr/local/bin/gm4: Cannot open foo: No such file or directory # autom4te: /usr/local/bin/gm4 failed with exit status: 1 # +# or this (GNU M4 1.4.13 installed as m4-1.4.13): +# +# /usr/bin/m4-1.4.13:script.4s:1: include: cannot open `foo': No such file or directory +# autom4te: /usr/bin/m4-1.4.13 failed with exit status: 1 +# # becomes # # m4:script.4s:1: cannot open `foo': No such file or directory @@ -108,8 +113,8 @@ m4_define([AT_CHECK_M4], [AT_CHECK([$1], [$2], [$3], m4_case([$4], [], [], [ignore], [ignore], [stderr])) m4_case([$4], [], [], [ignore], [], -[AT_CHECK([[sed 's/^[^:]*m4[.ex]*: *\([^:]*:\) *\([0-9][0-9]*: \)/m4:\1\2/ - s/^\([^:]*:\) *\([0-9][0-9]*:\)[^:]*m4[.ex]*: /m4:\1\2 / +[AT_CHECK([[sed 's/^[^:]*m4[-.ex0-9]*: *\([^:]*:\) *\([0-9][0-9]*: \)/m4:\1\2/ + s/^\([^:]*:\) *\([0-9][0-9]*:\)[^:]*m4[-.ex0-9]*: /m4:\1\2 / s/: C\(annot open \)\([^`:]*\):/: c\1`\2'\'':/ s/: include:\( cannot open\)/:\1/ s/^autom4te: [^ ]*m4[.ex]* /autom4te: m4 /