tests: enhance AT_SYNCLINES_COMPILE.

	* tests/synclines.at (AT_SYNCLINES_COMPILE): More distcc patterns.
	(AT_TEST_SYNCLINE): Remove GCC 4.5 protection which is already
	taken care of in AT_SYNCLINES_COMPILE.

diff --git a/ChangeLog b/ChangeLog
index 216c2e8aa2db69f842d47c92ebf90c9e740c887c..63379f559549dd2ccbccdbf803270fbffe904653 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-04  Akim Demaille  <demaille@gostai.com>
+
+       tests: enhance AT_SYNCLINES_COMPILE.
+       * tests/synclines.at (AT_SYNCLINES_COMPILE): More distcc patterns.
+       (AT_TEST_SYNCLINE): Remove GCC 4.5 protection which is already
+       taken care of in AT_SYNCLINES_COMPILE.
+
 2010-05-04  Akim Demaille  <demaille@gostai.com>
 
        lalr1.cc: don't generate location.hh when location_type is defined

diff --git a/tests/synclines.at b/tests/synclines.at
index d773962552ff05ed89065edd2a86b22831dc8b0b..83a26d05279c667070e32de1165ba4a5981321a2 100644 (file)
--- a/tests/synclines.at
+++ b/tests/synclines.at
@@ -47,8 +47,13 @@ m4_define([AT_SYNCLINES_COMPILE],
 #   distcc[33187] ERROR: compile (null) on localhost failed
 #   syncline.c:1:2: error: #error "1"
 #   distcc[33185] ERROR: compile syncline.c on localhost failed
+#
+# or even
+#
+#   distcc[35882] (dcc_connect_by_name) ERROR: failed to look up host "chrisimac": Unknown host
+#   distcc[35882] Warning: failed to distribute input.c to chrisimac/4, running locally instead
 
-AT_CHECK([[sed -e '/^distcc\[[0-9]*\] ERROR: .*/d'                   \
+AT_CHECK([[sed -e '/^distcc\[[0-9]*\] /d'                            \
                -e 's/^\([^:]*:[^:.]*\)[.:][^:]*:\(.*\)$/\1:\2/'      \
                -e 's/^\([^:]*:[^:]*:\)[^@%:@]*\( @%:@error\)/\1\2/'  \
                -e "/^[^:]*: In function '[^\']*':$/d"                \
@@ -90,9 +95,7 @@ AT_CHECK([[test "`cat stdout`" = 'syncline.c:1: @%:@error "1"' || exit 77]])
 AT_DATA([[input.y]], [$2])
 AT_BISON_CHECK([-o input.c input.y])
 AT_SYNCLINES_COMPILE([input.c])
-# GCC 4.5 tells you the function within which #error appears, but
-# previous versions of gcc do not.
-AT_CHECK([grep -v ': In function ' stdout], 0, [$3])
+AT_CHECK([cat stdout], 0, [$3])
 AT_CLEANUP
 ])