mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-09 12:23:04 +00:00
f39ab2869c
M4's output pipe was not being drained upon fatal errors during
scan_skel. As a result, broken-pipe messages from M4 were seen
on at least AIX, HP-UX, Solaris, and RHEL4, and this caused a
failure in the test suite. The problem was that, on platforms
where the default disposition for SIGPIPE is ignore instead of
terminate, M4 sometimes saw fwrite fail with errno=EPIPE and
then reported it. However, there's some sort of race condition,
because the new test group occasionally succeeded.
Reported by Albert Chin at
<http://lists.gnu.org/archive/html/bug-bison/2010-02/msg00004.html>.
There were also problems with the test suite livelocking on
Tru64 5.1b. Reported by Didier Godefroy at
<http://lists.gnu.org/archive/html/bug-bison/2009-05/msg00005.html>.
Switching to create_pipe_bidi suggested by Akim Demaille.
To attempt to solve both of these problems, switch to gnulib's
create_pipe_bidi and register M4 process as a slave. Along the
way, clean up file name conflict handling, which was affected by
the broken-pipe problem before the switch.
* NEWS (2.4.2): Document.
* THANKS (Didier Godefroy): Add.
* bootstrap.conf (gnulib_modules): Add pipe.
* gnulib: Update to latest to make sure we have all the latest
fixes.
* lib/local.mk (lib_libbison_a_SOURCES): Remove subpipe.h and
subpipe.c.
* po/POTFILES.in (lib/subpipe.c): Remove.
* src/files.c (compute_output_file_names): Update invocations
of output_file_name_check.
(output_file_name_check): In the case that the grammar file
would be overwritten, use complain instead of fatal, but replace
the output file name with /dev/null. Use the /dev/null solution
for the case of two conflicting output files as well because it
seems safer in case Bison one day tries to open both files at
the same time.
* src/files.h (output_file_name_check): Update prototype.
* src/output.c (output_skeleton): Use create_pipe_bidi and
wait_subprocess. Assert that scan_skel completely drains the
pipe.
* src/scan-skel.l (at_directive_perform): Update
output_file_name_check invocation.
* tests/output.at (AT_CHECK_CONFLICTING_OUTPUT): Check that the
grammar file actually isn't overwritten.
(Conflicting output files: -o foo.y): Update expected output.
* tests/skeletons.at (Fatal errors but M4 continues producing
output): New test group.
(cherry picked from commit 22cc8d813e)
Conflicts:
NEWS
bootstrap.conf
lib/.cvsignore
lib/.gitignore
lib/Makefile.am
m4/.cvsignore
m4/.gitignore
src/output.c
333 lines
7.5 KiB
Plaintext
333 lines
7.5 KiB
Plaintext
# Checking skeleton support. -*- Autotest -*-
|
|
# Copyright (C) 2007, 2009-2010 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
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
AT_BANNER([[Skeleton Support.]])
|
|
|
|
## ------------------------------ ##
|
|
## Relative skeleton file names. ##
|
|
## ------------------------------ ##
|
|
|
|
AT_SETUP([[Relative skeleton file names]])
|
|
|
|
AT_CHECK([[mkdir tmp]])
|
|
|
|
AT_DATA([[tmp/skel.c]],
|
|
[[m4@&t@_divert_push(0)d@&t@nl
|
|
@output(b4_parser_file_name@)d@&t@nl
|
|
b4_percent_define_get([[test]])
|
|
m4@&t@_divert_pop(0)
|
|
]])
|
|
|
|
AT_DATA([[skel.c]],
|
|
[[m4@&t@_divert_push(0)d@&t@nl
|
|
@output(b4_parser_file_name@)d@&t@nl
|
|
b4_percent_define_get([[test]]) -- Local
|
|
m4@&t@_divert_pop(0)
|
|
]])
|
|
|
|
AT_DATA([[tmp/input-gram.y]],
|
|
[[%skeleton "./skel.c"
|
|
%define test "Hello World"
|
|
%%
|
|
start: ;
|
|
]])
|
|
|
|
AT_DATA([[input-gram.y]],
|
|
[[%skeleton "./skel.c"
|
|
%define test "Hello World"
|
|
%%
|
|
start: ;
|
|
]])
|
|
|
|
AT_DATA([[tmp/input-cmd-line.y]],
|
|
[[%define test "Hello World"
|
|
%%
|
|
start: ;
|
|
]])
|
|
|
|
AT_BISON_CHECK([[tmp/input-gram.y]])
|
|
AT_CHECK([[cat input-gram.tab.c]], [[0]],
|
|
[[Hello World
|
|
]])
|
|
|
|
AT_BISON_CHECK([[input-gram.y]])
|
|
AT_CHECK([[cat input-gram.tab.c]], [[0]],
|
|
[[Hello World -- Local
|
|
]])
|
|
|
|
AT_BISON_CHECK([[--skeleton=tmp/skel.c tmp/input-cmd-line.y]])
|
|
AT_CHECK([[cat input-cmd-line.tab.c]], [[0]],
|
|
[[Hello World
|
|
]])
|
|
|
|
AT_CLEANUP
|
|
|
|
|
|
## ------------------------------- ##
|
|
## Installed skeleton file names. ##
|
|
## ------------------------------- ##
|
|
|
|
AT_SETUP([[Installed skeleton file names]])
|
|
|
|
m4_pushdef([AT_GRAM],
|
|
[[%{
|
|
#include <stdio.h>
|
|
void yyerror (char const *msg);
|
|
int yylex (void);
|
|
%}
|
|
|
|
%error-verbose
|
|
%token 'a'
|
|
|
|
%%
|
|
|
|
start: ;
|
|
|
|
%%
|
|
|
|
void
|
|
yyerror (char const *msg)
|
|
{
|
|
fprintf (stderr, "%s\n", msg);
|
|
}
|
|
|
|
int
|
|
yylex (void)
|
|
{
|
|
return 'a';
|
|
}
|
|
|
|
int
|
|
main (void)
|
|
{
|
|
return yyparse ();
|
|
}
|
|
]])
|
|
|
|
AT_DATA([[input-cmd-line.y]],
|
|
[AT_GRAM])
|
|
|
|
AT_DATA([[input-gram.y]],
|
|
[[%skeleton "yacc.c"]
|
|
AT_GRAM])
|
|
|
|
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_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
|
|
]])
|
|
|
|
m4_popdef([AT_GRAM])
|
|
|
|
AT_CLEANUP
|
|
|
|
|
|
## ------------------------------------------------------ ##
|
|
## %define Boolean variables: invalid skeleton defaults. ##
|
|
## ------------------------------------------------------ ##
|
|
|
|
AT_SETUP([[%define Boolean variables: invalid skeleton defaults]])
|
|
|
|
AT_DATA([[skel.c]],
|
|
[[b4_percent_define_default([[foo]], [[bogus value]])
|
|
b4_percent_define_flag_if([[foo]])
|
|
]])
|
|
|
|
AT_DATA([[input.y]],
|
|
[[%skeleton "./skel.c"
|
|
%%
|
|
start: ;
|
|
]])
|
|
|
|
AT_BISON_CHECK([[input.y]], [[1]], [[]],
|
|
[[<skeleton default value>: invalid value for %define Boolean variable `foo'
|
|
]])
|
|
|
|
AT_CLEANUP
|
|
|
|
|
|
## --------------------------------------------- ##
|
|
## Complaining during macro argument expansion. ##
|
|
## --------------------------------------------- ##
|
|
|
|
AT_SETUP([[Complaining during macro argument expansion]])
|
|
|
|
AT_DATA([[skel1.c]],
|
|
[[m4@&t@_define([foow], [b4_warn([[foow fubar]])])
|
|
m4@&t@_define([foowat], [b4_warn_at([[foow.y:2.3]],
|
|
[[foow.y:5.4]], [[foowat fubar]])])
|
|
m4@&t@_define([fooc], [b4_complain([[fooc fubar]])])
|
|
m4@&t@_define([foocat], [b4_complain_at([[fooc.y:1.1]],
|
|
[[fooc.y:10.6]], [[foocat fubar]])])
|
|
m4@&t@_define([foof], [b4_fatal([[foof fubar]])])
|
|
m4@&t@_if(foow, [1], [yes])
|
|
m4@&t@_if(foowat, [1], [yes])
|
|
m4@&t@_if(fooc, [1], [yes])
|
|
m4@&t@_if(foocat, [1], [yes])
|
|
m4@&t@_if(foof, [1], [yes])
|
|
]])
|
|
|
|
AT_DATA([[input1.y]],
|
|
[[%skeleton "./skel1.c"
|
|
%%
|
|
start: ;
|
|
]])
|
|
|
|
AT_BISON_CHECK([[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
|
|
input1.y: fatal error: foof fubar
|
|
]])
|
|
|
|
AT_DATA([[skel2.c]],
|
|
[[m4@&t@_define([foofat], [b4_fatal_at([[foof.y:12.11]],
|
|
[[foof.y:100.123]], [[foofat fubar]])])
|
|
m4@&t@_if(foofat, [1], [yes])
|
|
]])
|
|
|
|
AT_DATA([[input2.y]],
|
|
[[%skeleton "./skel2.c"
|
|
%%
|
|
start: ;
|
|
]])
|
|
|
|
AT_BISON_CHECK([[input2.y]], [[1]], [[]],
|
|
[[foof.y:12.11-100.122: fatal error: foofat fubar
|
|
]])
|
|
|
|
AT_DATA([[skel3.c]],
|
|
[[b4_complain_at(b4_percent_define_get_loc([[bogus]]), [[bad value]])
|
|
]])
|
|
|
|
AT_DATA([[input3.y]],
|
|
[[%skeleton "./skel3.c"
|
|
%%
|
|
start: ;
|
|
]])
|
|
|
|
AT_BISON_CHECK([[input3.y]], [[1]], [[]],
|
|
[[input3.y: fatal error: undefined %define variable `bogus' passed to b4_percent_define_get_loc
|
|
]])
|
|
|
|
AT_DATA([[skel4.c]],
|
|
[[b4_warn_at(b4_percent_define_get_syncline([[bogus]]), [[bad value]])
|
|
]])
|
|
|
|
AT_DATA([[input4.y]],
|
|
[[%skeleton "./skel4.c"
|
|
%%
|
|
start: ;
|
|
]])
|
|
|
|
AT_BISON_CHECK([[input4.y]], [[1]], [[]],
|
|
[[input4.y: fatal error: undefined %define variable `bogus' passed to b4_percent_define_get_syncline
|
|
]])
|
|
|
|
AT_CLEANUP
|
|
|
|
|
|
## --------------------------------------- ##
|
|
## Fatal errors make M4 exit immediately. ##
|
|
## --------------------------------------- ##
|
|
|
|
AT_SETUP([[Fatal errors make M4 exit immediately]])
|
|
|
|
AT_DATA([[skel1.c]],
|
|
[[b4_complain([[non-fatal error]])
|
|
b4_fatal([[M4 should exit immediately here]])
|
|
m4@&t@_fatal([this should never be evaluated])
|
|
]])
|
|
|
|
AT_DATA([[input1.y]],
|
|
[[%skeleton "./skel1.c"
|
|
%%
|
|
start: ;
|
|
]])
|
|
|
|
AT_BISON_CHECK([[input1.y]], [[1]], [[]],
|
|
[[input1.y: non-fatal error
|
|
input1.y: fatal error: M4 should exit immediately here
|
|
]])
|
|
|
|
AT_DATA([[skel2.c]],
|
|
[[b4_warn([[morning]])
|
|
b4_fatal_at([[foo.y:1.5]], [[foo.y:1.7]], [[M4 should exit immediately here]])
|
|
m4@&t@_fatal([this should never be evaluated])
|
|
]])
|
|
|
|
AT_DATA([[input2.y]],
|
|
[[%skeleton "./skel2.c"
|
|
%%
|
|
start: ;
|
|
]])
|
|
|
|
AT_BISON_CHECK([[input2.y]], [[1]], [[]],
|
|
[[input2.y: warning: morning
|
|
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
|