diff options
author | Joel E. Denny <joeldenny@joeldenny.org> | 2010-08-01 18:51:46 -0400 |
---|---|---|
committer | Joel E. Denny <joeldenny@joeldenny.org> | 2010-08-01 23:25:40 -0400 |
commit | 4631c34fb78bebfd3764ebe77d4f4baae757dbf6 (patch) | |
tree | 88e82ba1838decd517cc383ac59b5856fec77219 /tests | |
parent | 3e948170f7f4ee1904a17e0717d4619e51be5cac (diff) | |
download | bison-4631c34fb78bebfd3764ebe77d4f4baae757dbf6.tar.gz |
-Werror: fix for rules useless in parser after conflicts.
* NEWS (2.4.3): Document fix.
* src/complain.c (error_message): Extend to handle incomplete
error messages so warn and warn_at can be used in more cases.
* src/gram.c (grammar_rules_useless_report): Use warn_at so that
-Werror is always obeyed.
* src/reduce.c (reduce_print): Use warn so that the "warnings
being treated as errors" message is printed consistently before
the first warning message. This makes testing easier.
* tests/local.at (AT_BISON_WERROR_MSG): New macro.
(AT_BISON_CHECK_NO_XML): Extend to check -Werror and
--warnings=error when warnings appear in bison's stderr.
(cherry picked from commit 954474bfa1a875eeefe9aa1989d9c7be6f64726b)
Diffstat (limited to 'tests')
-rw-r--r-- | tests/local.at | 65 |
1 files changed, 64 insertions, 1 deletions
diff --git a/tests/local.at b/tests/local.at index f59d3731..0e39479a 100644 --- a/tests/local.at +++ b/tests/local.at @@ -252,11 +252,17 @@ $2]) # # 2. In the case of maintainer-xml-check, XML/XSLT output is compared with # --graph and --report=all output for every working grammar. +# +# 3. If stderr contains a warning, -Werror and --warnings=error +# convert the warning to an error. m4_define([AT_BISON_CHECK], [m4_if(m4_quote($2), [0], [AT_BISON_CHECK_XML($@)], m4_quote($2), [], [AT_BISON_CHECK_XML($@)]) AT_BISON_CHECK_NO_XML($@)]) +m4_define([AT_BISON_WERROR_MSG], + [[bison: warnings being treated as errors]]) + # AT_BISON_CHECK_NO_XML(BISON_ARGS, [OTHER_AT_CHECK_ARGS]) # -------------------------------------------------------- # Same as AT_BISON_CHECK except don't perform XML/XSLT checks. This is useful @@ -264,7 +270,64 @@ AT_BISON_CHECK_NO_XML($@)]) # handle. m4_define([AT_BISON_CHECK_NO_XML], [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_quote(m4_if(m4_quote($2), [], [0], [$2])), [0], + [[# Don't interfere with caller's files. + if test -f stderr; then + mv stderr at-bison-check-stderr.bak + fi + if test -f experr; then + mv experr at-bison-check-experr.bak + fi + + # Run with -Werror. + ]AT_CHECK(AT_QUELL_VALGRIND[[ bison -Werror ]$1], + [[1]], [$3], [stderr])[ + + # Build expected stderr up to and including the "warnings + # being treated as errors" message. + ]AT_DATA([[at-bison-check-warnings]], [$4])[ + at_bison_check_first="` \ + sed -n '/: warning: /=' at-bison-check-warnings \ + | sed -n 1p \ + `" + if test $at_bison_check_first -gt 1; then + sed -n "1,`expr $at_bison_check_first - 1`"p \ + at-bison-check-warnings > experr + fi + echo ']AT_BISON_WERROR_MSG[' >> experr + + # Finish building expected stderr and check. Unlike + # warnings, complaints cause bison to exit early. Thus, + # with -Werror, bison does not necessarily report all + # warnings that it does without -Werror, but it at least + # reports one. + at_bison_check_last="`sed -n '$=' stderr`" + if test x"$at_bison_check_last" = x; then + at_bison_check_last=1 + fi + at_bison_check_last="`expr $at_bison_check_last - 1`" + sed -n "$at_bison_check_first,$at_bison_check_last"p \ + at-bison-check-warnings >> experr + ]AT_CHECK([[sed 's,.*/\(]AT_BISON_WERROR_MSG[\)$,\1,' \ + stderr 1>&2]], [[0]], [[]], [experr])[ + + # Now check --warnings=error. + cp stderr experr + ]AT_CHECK(AT_QUELL_VALGRIND[[ bison --warnings=error ]$1], + [[1]], [$3], [experr])[ + + # Restore caller's files. + if test -f at-bison-check-experr.bak; then + mv at-bison-check-experr.bak experr + fi + if test -f at-bison-check-stderr.bak; then + mv at-bison-check-stderr.bak stderr + fi + ]]) + ]) +]) # AT_BISON_CHECK_XML(BISON_ARGS, [OTHER_AT_CHECK_ARGS]) # ----------------------------------------------------- |