From: Ralf Wildenhues Date: Tue, 25 Mar 2008 06:01:49 +0000 (+0100) Subject: Factorize m4 warning output normalization. X-Git-Tag: v2.62~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70684ede3e27c97adb03db254b1b589f5fc59e84;p=thirdparty%2Fautoconf.git Factorize m4 warning output normalization. * tests/local.at (AT_CHECK_M4): Factorize warning output normalization. Suggested by Eric Blake. Signed-off-by: Ralf Wildenhues --- diff --git a/ChangeLog b/ChangeLog index 1b13d170..c847b35f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-03-25 Ralf Wildenhues + + * tests/local.at (AT_CHECK_M4): Factorize warning output + normalization. + Suggested by Eric Blake. + 2008-03-24 Ralf Wildenhues Fix .exe-related test failure on MinGW. diff --git a/tests/local.at b/tests/local.at index 33fbf05c..0f0ecad7 100644 --- a/tests/local.at +++ b/tests/local.at @@ -106,13 +106,11 @@ 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: *\([^:]*:\) *\([0-9][0-9]*: \)/m4:\1\2/ - s/^[^:]*m4\.exe: *\([^:]*:\) *\([0-9][0-9]*: \)/m4:\1\2/ - s/^\([^:]*:\) *\([0-9][0-9]*:\)[^:]*m4: /m4:\1\2 / +[AT_CHECK([[sed 's/^[^:]*m4[.ex]*: *\([^:]*:\) *\([0-9][0-9]*: \)/m4:\1\2/ + s/^\([^:]*:\) *\([0-9][0-9]*:\)[^:]*m4[.ex]*: /m4:\1\2 / s/: C\(annot open \)\([^`:]*\):/: c\1`\2'\'':/ s/: include:\( cannot open\)/:\1/ - s/^autom4te: [^ ]*m4 /autom4te: m4 / - s/^autom4te: [^ ]*m4\.exe /autom4te: m4 / + s/^autom4te: [^ ]*m4[.ex]* /autom4te: m4 / s/ (E[A-Z]*)$// ' stderr >&2]], [0], [], [$4])]) ])