tests: distcc compliance.

	* tests/synclines.at (AT_SYNCLINES_COMPILE): Discard distcc's
	error messages from the output.

diff --git a/ChangeLog b/ChangeLog
index 903d2678d635f076c5088e90e217e4c25c0cf544..e3defd818db01fffb5dc7a786a293e1368c919ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-19  Akim Demaille  <demaille@gostai.com>
+
+       tests: distcc compliance.
+       * tests/synclines.at (AT_SYNCLINES_COMPILE): Discard distcc's
+       error messages from the output.
+
 2009-08-19  Akim Demaille  <demaille@gostai.com>
 
        variables: simplify the upgrade of namespace into api.namespace.

diff --git a/tests/synclines.at b/tests/synclines.at
index 56efdac66b39d9806c8c9eeb392868c3de604092..1f1f9bad6030d2b69eb7c166d31f7a2ea254faee 100644 (file)
--- a/tests/synclines.at
+++ b/tests/synclines.at
@@ -41,7 +41,15 @@ m4_define([AT_SYNCLINES_COMPILE],
 # =>
 #   input.y:4: #error "8"
 #
-AT_CHECK([[sed -e 's/^\([^:]*:[^:.]*\)[.:][^:]*:\(.*\)$/\1:\2/'      \
+#
+# And possibly distcc adds its bits.
+#
+#   distcc[33187] ERROR: compile (null) on localhost failed
+#   syncline.c:1:2: error: #error "1"
+#   distcc[33185] ERROR: compile syncline.c on localhost failed
+
+AT_CHECK([[sed -e '/^distcc\[[0-9]*\] ERROR: .*/d'                   \
+               -e 's/^\([^:]*:[^:.]*\)[.:][^:]*:\(.*\)$/\1:\2/'      \
                -e 's/^\([^:]*:[^:]*:\)[^@%:@]*\( @%:@error\)/\1\2/'  \
                -e "/^[^:]*: In function '[^\']*':$/d"                \
             stderr]],