Normalize compiler output due to compiler wrappers.

* tests/testsuite.at (LT_AT_NORMALIZE_COMPILER_OUTPUT): New
macro, to normalize ccache and distcc output.
* tests/localization.at (localized compiler messages): Use it.

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

diff --git a/ChangeLog b/ChangeLog
index f7fd4d18b4da2bb316a34c2da51d8875a8ee63cf..3c2871dfcb73c00cca9d68a7120720568c873535 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-29  Akim Demaille  <demaille@gostai.com>
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Normalize compiler output due to compiler wrappers.
+       * tests/testsuite.at (LT_AT_NORMALIZE_COMPILER_OUTPUT): New
+       macro, to normalize ccache and distcc output.
+       * tests/localization.at (localized compiler messages): Use it.
+
 2009-01-29  Peter Rosin  <peda@lysator.liu.se>
 
        Make modified libtool script in cwrapper test executable

diff --git a/tests/localization.at b/tests/localization.at
index 92b19ac1473826b433ed8c297f643c721498dfd5..119b38daca52ff0dd3839ad4337b5e0b0efe0faa 100644 (file)
--- a/tests/localization.at
+++ b/tests/localization.at
@@ -43,15 +43,13 @@ AT_CHECK([$CC $CPPFLAGS $CFLAGS -c b.c || exit 77], [], [stdout], [stderr])
 
 # Find out about expected output.
 AT_CHECK([$CC $CPPFLAGS $CFLAGS -c a.c || exit 1], [1], [stdout], [stderr])
-LT_AT_UNIFY_NL([stdout], [expected-stdout])
-LT_AT_UNIFY_NL([stderr], [expected-stderr])
+LT_AT_NORMALIZE_COMPILER_OUTPUT([stdout], [expected-stdout])
+LT_AT_NORMALIZE_COMPILER_OUTPUT([stderr], [expected-stderr])
 AT_CHECK([$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c a.c || exit 1],
         [1], [stdout], [stderr])
-LT_AT_UNIFY_NL([stderr])
-AT_CHECK([diff expected-stderr stderr])
-LTBASE=`$ECHO "$LIBTOOL" | sed 's,^.*/,,'`
-grep -v "^$LTBASE: compile" stdout > libtool-stdout
-LT_AT_UNIFY_NL([libtool-stdout])
+LT_AT_NORMALIZE_COMPILER_OUTPUT([stdout], [libtool-stdout])
+LT_AT_NORMALIZE_COMPILER_OUTPUT([stderr], [libtool-stderr])
+AT_CHECK([diff expected-stderr libtool-stderr])
 AT_CHECK([diff expected-stdout libtool-stdout])
 
 # check that we get our quoting right.

diff --git a/tests/testsuite.at b/tests/testsuite.at
index 24e817466daa0e2d1fcacbd9633a37706c948dfe..92e786eff7d4f4711264e0c5a1295de468c5e976 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -218,6 +218,20 @@ m4_define([LT_AT_UNIFY_NL],
 esac])
 
 
+# LT_AT_NORMALIZE_COMPILER_OUTPUT(FILE, [RESULT-FILE])
+# ----------------------------------------------------
+# Normalize differences in compiler output stemming from, e.g.,
+# - distcc process numbers,
+# - ccache file location,
+# - newline encoding,
+# - location of the libtool script.
+m4_define([LT_AT_NORMALIZE_COMPILER_OUTPUT],
+[_ltbase=`$ECHO "$LIBTOOL" | sed 's,^.*/,,'`
+[sed "/^distcc\[[0-9]*\]/d; /^$_ltbase: compile/d" < $1 > $1.t]
+LT_AT_UNIFY_NL([$1.t], [m4_default([$2], [$1])])[]dnl
+])
+
+
 # LT_AT_EXEC_CHECK(EXECUTABLE, [STATUS = 0], [STDOUT], [STDERR],
 #                 [ARGS-OR-STATUS-ADJUST])
 # --------------------------------------------------------------