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.
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

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.

View File

@@ -278,17 +278,14 @@ 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])[
@@ -297,8 +294,8 @@ m4_if(m4_bregexp([$4], [: warning: ]), [-1], [],
]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 \
@@ -310,11 +307,10 @@ m4_if(m4_bregexp([$4], [: warning: ]), [-1], [],
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
@@ -348,9 +344,9 @@ m4_if(m4_bregexp([$4], [: warning: ]), [-1], [],
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])
# ----------------------------------------------------- # -----------------------------------------------------