X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/401b73afdf9694e0d9380968ebfd21d837045a2c..d243e0241f79eed2b231fa9066a47f9daaafa82d:/tests/synclines.at?ds=sidebyside

diff --git a/tests/synclines.at b/tests/synclines.at
index 8653b460..c12ab9b7 100644
--- a/tests/synclines.at
+++ b/tests/synclines.at
@@ -1,6 +1,7 @@
 # Executing Actions.                               -*- Autotest -*-
-# Copyright (C) 2002, 2004, 2005, 2007, 2009 Free Software Foundation,
-# Inc.
+
+# Copyright (C) 2002, 2004-2005, 2007, 2009-2012 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,7 +23,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 +35,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)
@@ -63,6 +88,7 @@ m4_define([AT_TEST_SYNCLINE],
 
 AT_DATA([syncline.c],
 [[#error "1"
+int i; // avoids -pedantic warning about an empty translation unit
 ]])
 
 AT_SYNCLINES_COMPILE([syncline.c])