Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pacify maintainer-check-posix.

Browse Source 
Adding command-line options after the grammar file name is not
permitted, so disable checks that do that when
maintainer-check-posix is running.
* tests/local.at (AT_BISON_CHECK_NO_XML): Don't run the
problematic checks when POSIXLY_CORRECT=1.  Also, for readability,
remove an unnecessary m4_if.
This commit is contained in:
Joel E. Denny
2011-03-27 19:29:37 -04:00
parent 8ffd7912e3
commit fc7ce9970f
2 changed files with 71 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -1,3 +1,13 @@
2011-03-27 Joel E. Denny <joeldenny@joeldenny.org>
Pacify maintainer-check-posix.
Adding command-line options after the grammar file name is not
permitted, so disable checks that do that when
maintainer-check-posix is running.
* tests/local.at (AT_BISON_CHECK_NO_XML): Don't run the
problematic checks when POSIXLY_CORRECT=1. Also, for readability,
remove an unnecessary m4_if.
2011-03-27 Joel E. Denny <joeldenny@joeldenny.org> 2011-03-27 Joel E. Denny <joeldenny@joeldenny.org>
Add -Wother so -Wnone suppresses all warnings. Add -Wother so -Wnone suppresses all warnings.

126
tests/local.at
View File

@@ -278,78 +278,74 @@ m4_define([AT_BISON_CHECK_NO_XML],
[AT_CHECK(m4_if(m4_quote($2), [0], [], m4_quote($2), [], [], [AT_CHECK(m4_if(m4_quote($2), [0], [], m4_quote($2), [], [],
[AT_QUELL_VALGRIND ])[[bison ]]$@) [AT_QUELL_VALGRIND ])[[bison ]]$@)
m4_if(m4_bregexp([$4], [: warning: ]), [-1], [], m4_if(m4_bregexp([$4], [: warning: ]), [-1], [],
[m4_if(m4_quote(m4_if(m4_quote($2), [], [0], [$2])), [0], m4_quote(m4_if(m4_quote($2), [], [0], [$2])), [0], [[
[[# Don't interfere with caller's files. # POSIXLY_CORRECT=1 causes bison to complain if options are added
if test -f stderr; then # after the grammar file name, so skip these checks in that case.
mv stderr at-bison-check-stderr.bak if test x"$POSIXLY_CORRECT" != x1; then
fi # Don't interfere with caller's files.
if test -f experr; then if test -f stderr; then mv stderr at-bison-check-stderr.bak; fi
mv experr at-bison-check-experr.bak if test -f experr; then mv experr at-bison-check-experr.bak; fi
fi if test -f expout; then mv expout at-bison-check-expout.bak; fi
if test -f expout; then
mv expout at-bison-check-expout.bak
fi
# To avoid expanding it repeatedly, store specified stdout. # To avoid expanding it repeatedly, store specified stdout.
]AT_DATA([expout], [$3])[ ]AT_DATA([expout], [$3])[
# Run with -Werror. # Run with -Werror.
]AT_CHECK(AT_QUELL_VALGRIND[[ bison ]$1[ -Werror]], ]AT_CHECK(AT_QUELL_VALGRIND[[ bison ]$1[ -Werror]],
[[1]], [expout], [stderr])[ [[1]], [expout], [stderr])[
# Build expected stderr up to and including the "warnings # Build expected stderr up to and including the "warnings being
# being treated as errors" message. # treated as errors" message.
]AT_DATA([[at-bison-check-warnings]], [$4])[ ]AT_DATA([[at-bison-check-warnings]], [$4])[
at_bison_check_first="` \ at_bison_check_first="` \
sed -n '/: warning: /=' at-bison-check-warnings \ sed -n '/: warning: /=' at-bison-check-warnings \
| sed -n 1p \ | sed -n 1p \
`" `"
if test $at_bison_check_first -gt 1; then if test $at_bison_check_first -gt 1; then
sed -n "1,`expr $at_bison_check_first - 1`"p \ sed -n "1,`expr $at_bison_check_first - 1`"p \
at-bison-check-warnings > experr at-bison-check-warnings > experr
fi fi
echo ']AT_BISON_WERROR_MSG[' >> experr echo ']AT_BISON_WERROR_MSG[' >> experr
# Finish building expected stderr and check. Unlike # Finish building expected stderr and check. Unlike warnings,
# warnings, complaints cause bison to exit early. Thus, # complaints cause bison to exit early. Thus, with -Werror, bison
# with -Werror, bison does not necessarily report all # does not necessarily report all warnings that it does without
# warnings that it does without -Werror, but it at least # -Werror, but it at least reports one.
# reports one. at_bison_check_last="`sed -n '$=' stderr`"
at_bison_check_last="`sed -n '$=' stderr`" if test x"$at_bison_check_last" = x; then
if test x"$at_bison_check_last" = x; then at_bison_check_last=1
at_bison_check_last=1 fi
fi at_bison_check_last="`expr $at_bison_check_last - 1`"
at_bison_check_last="`expr $at_bison_check_last - 1`" sed -n "$at_bison_check_first,$at_bison_check_last"p \
sed -n "$at_bison_check_first,$at_bison_check_last"p \ at-bison-check-warnings >> experr
at-bison-check-warnings >> experr ]AT_CHECK([[sed 's,.*/\(]AT_BISON_WERROR_MSG[\)$,\1,' \
]AT_CHECK([[sed 's,.*/\(]AT_BISON_WERROR_MSG[\)$,\1,' \ stderr 1>&2]], [[0]], [[]], [experr])[
stderr 1>&2]], [[0]], [[]], [experr])[
# Now check --warnings=error. # Now check --warnings=error.
cp stderr experr cp stderr experr
]AT_CHECK(AT_QUELL_VALGRIND[[ bison ]$1[ --warnings=error]], ]AT_CHECK(AT_QUELL_VALGRIND[[ bison ]$1[ --warnings=error]],
[[1]], [expout], [experr])[ [[1]], [expout], [experr])[
# Now check -Wnone and --warnings=none by making sure that # Now check -Wnone and --warnings=none by making sure that
# -Werror doesn't change the exit status when -Wnone or # -Werror doesn't change the exit status when -Wnone or
# --warnings=none is specified. # --warnings=none is specified.
]AT_CHECK(AT_QUELL_VALGRIND[[ bison ]$1[ -Wnone -Werror]], ]AT_CHECK(AT_QUELL_VALGRIND[[ bison ]$1[ -Wnone -Werror]],
[[0]], [expout], [ignore])[ [[0]], [expout], [ignore])[
]AT_CHECK(AT_QUELL_VALGRIND[[ bison ]$1[ --warnings=none \ ]AT_CHECK(AT_QUELL_VALGRIND[[ bison ]$1[ --warnings=none \
-Werror]], [[0]], [expout], [ignore])[ -Werror]], [[0]], [expout], [ignore])[
# Restore caller's files. # Restore caller's files.
if test -f at-bison-check-expout.bak; then if test -f at-bison-check-expout.bak; then
mv at-bison-check-expout.bak expout mv at-bison-check-expout.bak expout
fi fi
if test -f at-bison-check-experr.bak; then if test -f at-bison-check-experr.bak; then
mv at-bison-check-experr.bak experr mv at-bison-check-experr.bak experr
fi fi
if test -f at-bison-check-stderr.bak; then if test -f at-bison-check-stderr.bak; then
mv at-bison-check-stderr.bak stderr mv at-bison-check-stderr.bak stderr
fi fi
]]) fi
]) ]])
]) ])
# AT_BISON_CHECK_XML(BISON_ARGS, [OTHER_AT_CHECK_ARGS]) # AT_BISON_CHECK_XML(BISON_ARGS, [OTHER_AT_CHECK_ARGS])