X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/35b8730d018b0bb25f7864d0db20f687ebad11b6..ee616bdc62db15f2f9bdad42bdf8699d9c374c8c:/tests/skeletons.at?ds=sidebyside diff --git a/tests/skeletons.at b/tests/skeletons.at index ca0cbb84..68a004ec 100644 --- a/tests/skeletons.at +++ b/tests/skeletons.at @@ -1,5 +1,6 @@ # Checking skeleton support. -*- Autotest -*- -# Copyright (C) 2007 Free Software Foundation, Inc. + +# Copyright (C) 2007, 2009-2013 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 @@ -58,17 +59,17 @@ AT_DATA([[tmp/input-cmd-line.y]], start: ; ]]) -AT_CHECK([[bison tmp/input-gram.y]]) +AT_BISON_CHECK([[tmp/input-gram.y]]) AT_CHECK([[cat input-gram.tab.c]], [[0]], [[Hello World ]]) -AT_CHECK([[bison input-gram.y]]) +AT_BISON_CHECK([[input-gram.y]]) AT_CHECK([[cat input-gram.tab.c]], [[0]], [[Hello World -- Local ]]) -AT_CHECK([[bison --skeleton=tmp/skel.c tmp/input-cmd-line.y]]) +AT_BISON_CHECK([[--skeleton=tmp/skel.c tmp/input-cmd-line.y]]) AT_CHECK([[cat input-cmd-line.tab.c]], [[0]], [[Hello World ]]) @@ -82,10 +83,11 @@ AT_CLEANUP AT_SETUP([[Installed skeleton file names]]) +AT_BISON_OPTION_PUSHDEFS m4_pushdef([AT_GRAM], [[%{ #include - void yyerror (char const *msg); + ]AT_YYERROR_DECLARE[ int yylex (void); %} @@ -98,39 +100,29 @@ start: ; %% -void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} - +]AT_YYERROR_DEFINE[ int yylex (void) { return 'a'; } - -int -main (void) -{ - return yyparse (); -} +]AT_MAIN_DEFINE[ ]]) -AT_DATA([[input-cmd-line.y]], +AT_DATA_GRAMMAR([[input-cmd-line.y]], [AT_GRAM]) -AT_DATA([[input-gram.y]], +AT_DATA_GRAMMAR([[input-gram.y]], [[%skeleton "yacc.c"] AT_GRAM]) -AT_CHECK([[bison --skeleton=yacc.c -o input-cmd-line.c input-cmd-line.y]]) +AT_BISON_CHECK([[--skeleton=yacc.c -o input-cmd-line.c input-cmd-line.y]]) AT_COMPILE([[input-cmd-line]]) AT_PARSER_CHECK([[./input-cmd-line]], [[1]], [], [[syntax error, unexpected 'a', expecting $end ]]) -AT_CHECK([[bison -o input-gram.c input-gram.y]]) +AT_BISON_CHECK([[-o input-gram.c input-gram.y]]) AT_COMPILE([[input-gram]]) AT_PARSER_CHECK([[./input-gram]], [[1]], [], [[syntax error, unexpected 'a', expecting $end @@ -138,6 +130,7 @@ AT_PARSER_CHECK([[./input-gram]], [[1]], [], m4_popdef([AT_GRAM]) +AT_BISON_OPTION_POPDEFS AT_CLEANUP @@ -158,8 +151,8 @@ AT_DATA([[input.y]], start: ; ]]) -AT_CHECK([[bison input.y]], [[1]], [[]], -[[[Bison:b4_percent_define_default]:1.0: invalid value for %define Boolean variable `foo' +AT_BISON_CHECK([[input.y]], [[1]], [[]], +[[: error: invalid value for %define Boolean variable 'foo' ]]) AT_CLEANUP @@ -192,11 +185,11 @@ AT_DATA([[input1.y]], start: ; ]]) -AT_CHECK([[bison input1.y]], [[1]], [[]], -[[input1.y: warning: foow fubar -foow.y:2.3-5.3: warning: foowat fubar -input1.y: fooc fubar -fooc.y:1.1-10.5: foocat fubar +AT_BISON_CHECK([[input1.y]], [[1]], [[]], +[[input1.y: warning: foow fubar [-Wother] +foow.y:2.3-5.3: warning: foowat fubar [-Wother] +input1.y: error: fooc fubar +fooc.y:1.1-10.5: error: foocat fubar input1.y: fatal error: foof fubar ]]) @@ -212,7 +205,7 @@ AT_DATA([[input2.y]], start: ; ]]) -AT_CHECK([[bison input2.y]], [[1]], [[]], +AT_BISON_CHECK([[input2.y]], [[1]], [[]], [[foof.y:12.11-100.122: fatal error: foofat fubar ]]) @@ -226,8 +219,8 @@ AT_DATA([[input3.y]], start: ; ]]) -AT_CHECK([[bison input3.y]], [[1]], [[]], -[[input3.y: fatal error: undefined %define variable `bogus' passed to b4_percent_define_get_loc +AT_BISON_CHECK([[input3.y]], [[1]], [[]], +[[input3.y: fatal error: b4_percent_define_get_loc: undefined %define variable 'bogus' ]]) AT_DATA([[skel4.c]], @@ -240,8 +233,8 @@ AT_DATA([[input4.y]], start: ; ]]) -AT_CHECK([[bison input4.y]], [[1]], [[]], -[[input4.y: fatal error: undefined %define variable `bogus' passed to b4_percent_define_get_syncline +AT_BISON_CHECK([[input4.y]], [[1]], [[]], +[[input4.y: fatal error: b4_percent_define_get_syncline: undefined %define variable 'bogus' ]]) AT_CLEANUP @@ -265,8 +258,8 @@ AT_DATA([[input1.y]], start: ; ]]) -AT_CHECK([[bison input1.y]], [[1]], [[]], -[[input1.y: non-fatal error +AT_BISON_CHECK([[input1.y]], [[1]], [[]], +[[input1.y: error: non-fatal error input1.y: fatal error: M4 should exit immediately here ]]) @@ -282,9 +275,51 @@ AT_DATA([[input2.y]], start: ; ]]) -AT_CHECK([[bison input2.y]], [[1]], [[]], -[[input2.y: warning: morning +AT_BISON_CHECK([[input2.y]], [[1]], [[]], +[[input2.y: warning: morning [-Wother] foo.y:1.5-6: fatal error: M4 should exit immediately here ]]) AT_CLEANUP + + +## ------------------------------------------------ ## +## Fatal errors but M4 continues producing output. ## +## ------------------------------------------------ ## + +# At one time, if Bison encountered a fatal error during M4 processing, +# Bison failed to drain M4's output pipe. The result was a SIGPIPE. +# On some platforms, the default disposition for SIGPIPE is terminate, +# which was fine. On others, it's ignore, which caused M4 to report +# the broken pipe to the user, but we don't want to bother the user with +# that. + +# There is a race condition somewhere. That is, before the associated +# fix, running this test group many times in a row would occasionally +# produce a pass among all the failures. + +AT_SETUP([[Fatal errors but M4 continues producing output]]) + +AT_DATA([[gen-skel.pl]], +[[use warnings; +use strict; +my $M4 = "m4"; +my $DNL = "d"."nl"; +print "${M4}_divert_push(0)$DNL\n"; +print '@output(@,@)', "\n"; +(print "garbage"x10, "\n") for (1..1000); +print "${M4}_divert_pop(0)\n"; +]]) +AT_CHECK([[$PERL gen-skel.pl > skel.c || exit 77]]) + +AT_DATA([[input.y]], +[[%skeleton "./skel.c" +%% +start: ; +]]) + +AT_BISON_CHECK([[input.y]], [[1]], [[]], +[[input.y: fatal error: too many arguments for @output directive in skeleton +]]) + +AT_CLEANUP