mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-09 20:33:03 +00:00
47fa574761
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/Makefile.am (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
m4/.cvsignore
m4/.gitignore
src/output.c
70 lines
2.3 KiB
Plaintext
70 lines
2.3 KiB
Plaintext
# Bootstrap configuration.
|
|
|
|
# Copyright (C) 2006-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/>.
|
|
|
|
# gnulib modules used by this package.
|
|
gnulib_modules='
|
|
announce-gen argmatch assert config-h c-strcase configmake dirname
|
|
error extensions fopen-safer gendocs getopt-gnu gettext
|
|
git-version-gen hash inttypes javacomp-script javaexec-script
|
|
maintainer-makefile malloc mbswidth obstack pipe quote quotearg
|
|
realloc-posix stdbool stpcpy strerror strtoul strverscmp unistd
|
|
unistd-safer unlocked-io update-copyright unsetenv verify warnings
|
|
xalloc xalloc-die xstrndup
|
|
|
|
fprintf-posix printf-posix snprintf-posix sprintf-posix
|
|
vsnprintf-posix vsprintf-posix
|
|
'
|
|
|
|
# Additional xgettext options to use. Use "\\\newline" to break lines.
|
|
XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
|
|
--from-code=UTF-8\\\
|
|
--flag=asprintf:2:c-format\\\
|
|
--flag=complain:1:c-format --flag=complain_at:2:c-format\\\
|
|
--flag=fatal:1:c-format --flag=fatal_at:2:c-format\\\
|
|
--flag=warn:1:c-format --flag=warn_at:2:c-format\\\
|
|
--flag=unexpected_end:2:c-format\\\
|
|
'
|
|
XGETTEXT_OPTIONS_RUNTIME=$XGETTEXT_OPTIONS'\\\
|
|
--keyword=YY_ \\\
|
|
'
|
|
|
|
# Gettext supplies these files, but we don't need them since
|
|
# we don't have an intl subdirectory.
|
|
excluded_files='
|
|
m4/codeset.m4
|
|
m4/glibc2.m4
|
|
m4/glibc21.m4
|
|
m4/intdiv0.m4
|
|
m4/intl.m4
|
|
m4/intldir.m4
|
|
m4/intmax.m4
|
|
m4/inttypes_h.m4
|
|
m4/lcmessage.m4
|
|
m4/lock.m4
|
|
m4/longdouble.m4
|
|
m4/signed.m4
|
|
m4/size_max.m4
|
|
m4/uintmax_t.m4
|
|
m4/ulonglong.m4
|
|
m4/visibility.m4
|
|
m4/xsize.m4
|
|
'
|
|
|
|
# In directories like lib/, m4/, and po/, generate both these files because we
|
|
# still try to support CVS emulation.
|
|
vc_ignore='.cvsignore .gitignore'
|