Factorize m4 warning output normalization.

* tests/local.at (AT_CHECK_M4): Factorize warning output
normalization.
Suggested by Eric Blake.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 1b13d170e7524e64b6bdd74b65b6bbd815ab5789..c847b35fa0eae8811cfb79f78de73003d907918c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-25  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * tests/local.at (AT_CHECK_M4): Factorize warning output
+       normalization.
+       Suggested by Eric Blake.
+
 2008-03-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Fix .exe-related test failure on MinGW.

diff --git a/tests/local.at b/tests/local.at
index 33fbf05c5f01df8f59c804ce7ea79251cbd65236..0f0ecad77081fd812109a4f536d1a83edab0aa4a 100644 (file)
--- 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])])
 ])