X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/132247cd94d409f04997dc0b550f4ee6abbb735a..9bcffa0c13d1abee13433f14cdb785cbb960425c:/tests/synclines.at

diff --git a/tests/synclines.at b/tests/synclines.at
index a9754333..8d742d53 100644
--- a/tests/synclines.at
+++ b/tests/synclines.at
@@ -1,5 +1,6 @@
 # Executing Actions.                               -*- Autotest -*-
-# Copyright (C) 2002, 2004-2005, 2007, 2009-2010 Free Software
+
+# Copyright (C) 2002, 2004-2005, 2007, 2009-2012 Free Software
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
@@ -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)
@@ -43,7 +68,7 @@ AT_CHECK([[sed -e 's/^\([^:]*:[^:.]*\)[.:][^:]*:\(.*\)$/\1:\2/' -e 's/^\([^:]*:[
 # to issue ERROR-MSG.
 m4_define([AT_TEST_SYNCLINE],
 [AT_SETUP([$1])
-
+AT_BISON_OPTION_PUSHDEFS
 # It seems impossible to find a generic scheme to check the location
 # of an error.  Even requiring GCC is not sufficient, since for instance
 # the version modified by Apple:
@@ -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])
@@ -71,9 +97,8 @@ 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_BISON_OPTION_POPDEFS
 AT_CLEANUP
 ])
 
@@ -86,11 +111,12 @@ AT_CLEANUP
 AT_TEST_SYNCLINE([Prologue synch line],
 [[%{
 #error "2"
-void yyerror (const char *s);
-int yylex (void);
+]AT_YYERROR_DECLARE_EXTERN[
+]AT_YYLEX_DECLARE_EXTERN[
 %}
 %%
 exp: '0';
+%%
 ]],
 [input.y:2: #error "2"
 ])
@@ -106,11 +132,12 @@ AT_TEST_SYNCLINE([%union synch line],
   char dummy;
 }
 %{
-void yyerror (const char *s);
-int yylex (void);
+]AT_YYERROR_DECLARE_EXTERN[
+]AT_YYLEX_DECLARE_EXTERN[
 %}
 %%
 exp: '0';
+%%
 ]],
 [input.y:2: #error "2"
 ])
@@ -122,8 +149,8 @@ exp: '0';
 
 AT_TEST_SYNCLINE([Postprologue synch line],
 [[%{
-void yyerror (const char *s);
-int yylex (void);
+]AT_YYERROR_DECLARE_EXTERN[
+]AT_YYLEX_DECLARE_EXTERN[
 %}
 %union
 {
@@ -134,6 +161,7 @@ int yylex (void);
 %}
 %%
 exp: '0';
+%%
 ]],
 [input.y:10: #error "10"
 ])
@@ -145,8 +173,8 @@ exp: '0';
 
 AT_TEST_SYNCLINE([Action synch line],
 [[%{
-void yyerror (const char *s);
-int yylex (void);
+]AT_YYERROR_DECLARE_EXTERN[
+]AT_YYLEX_DECLARE_EXTERN[
 %}
 %%
 exp:
@@ -164,8 +192,8 @@ exp:
 
 AT_TEST_SYNCLINE([Epilogue synch line],
 [[%{
-void yyerror (const char *s);
-int yylex (void);
+]AT_YYERROR_DECLARE_EXTERN[
+]AT_YYLEX_DECLARE_EXTERN[
 %}
 %%
 exp: '0';