From bdc360ae58d652f2cb5f5145844c359e1a3e5d3c Mon Sep 17 00:00:00 2001
From: Akim Demaille <demaille@gostai.com>
Date: Wed, 14 Apr 2010 16:40:18 +0200
Subject: [PATCH] tests: enhance AT_SYNCLINES_COMPILE.

	* tests/synclines.at (AT_TEST_SYNCLINE): Move GCC 4.5 protection
	into...
	(AT_SYNCLINES_COMPILE): here.
	Add more distcc patterns.

(cherry picked from commit c826013fb38c98861ef0fc5d4dc3fb3fb4f555be)

Conflicts:

	tests/synclines.at
---
 ChangeLog          |  8 ++++++++
 tests/synclines.at | 32 +++++++++++++++++++++++++++-----
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 454a0c0f..514dd5d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-05-04  Akim Demaille  <demaille@gostai.com>
+
+	tests: enhance AT_SYNCLINES_COMPILE.
+	* tests/synclines.at (AT_TEST_SYNCLINE): Move GCC 4.5 protection
+	into...
+	(AT_SYNCLINES_COMPILE): here.
+	Add more distcc patterns.
+
 2010-05-01  Joel E. Denny  <joeldenny@joeldenny.org>
 
 	tests: fix maintainer-xml-check.
diff --git a/tests/synclines.at b/tests/synclines.at
index a9754333..a464e87e 100644
--- a/tests/synclines.at
+++ b/tests/synclines.at
@@ -22,7 +22,7 @@ AT_BANNER([[User Actions.]])
 # --------------------------
 # Compile FILE expecting an error, and save in the file stdout the
 # normalized output.  Ignore the exit status, since some compilers
-# (e.g. c89 on IRIX 6.5) triger warnings on `#error', instead of
+# (e.g. c89 on IRIX 6.5) trigger warnings on `#error', instead of
 # errors.
 m4_define([AT_SYNCLINES_COMPILE],
 [AT_CHECK([$CC $CFLAGS $CPPFLAGS -c $1], [ignore], [], [stderr])
@@ -34,7 +34,31 @@ m4_define([AT_SYNCLINES_COMPILE],
 # =>
 #   input.y:4: #error "4"
 #
-AT_CHECK([[sed -e 's/^\([^:]*:[^:.]*\)[.:][^:]*:\(.*\)$/\1:\2/' -e 's/^\([^:]*:[^:]*:\)[^@%:@]*\( @%:@error\)/\1\2/' stderr]], 0, [stdout])
+# It may also issue more context information:
+#
+#   input.y: In function 'yyparse':
+#   input.y:8: #error "8"
+# =>
+#   input.y:4: #error "8"
+#
+#
+# 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
+#
+# 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]*\] /d'                            \
+               -e 's/^\([^:]*:[^:.]*\)[.:][^:]*:\(.*\)$/\1:\2/'      \
+               -e 's/^\([^:]*:[^:]*:\)[^@%:@]*\( @%:@error\)/\1\2/'  \
+               -e "/^[^:]*: In function '[^\']*':$/d"                \
+            stderr]],
+         0, [stdout])
 ])
 
 # AT_TEST_SYNCLINE(TITLE, INPUT, ERROR-MSG)
@@ -71,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
 ])
 
-- 
2.47.2