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.
(cherry picked from commit fc7ce9970f2972443c1a031c91ffef2dfdf28651)

diff --git a/ChangeLog b/ChangeLog
index aff493f48b195eab373d108a19487cba0982587b..7886ddfaa16f66a3939e97e4c26036a47c63b331 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        Add -Wother so -Wnone suppresses all warnings.

diff --git a/tests/local.at b/tests/local.at
index b9eae0be46c0431b101c2481e5ea2240f29f2ee5..c5e673383aaac10ed9cca23f77dd46f103406ee3 100644 (file)
--- a/tests/local.at
+++ b/tests/local.at
@@ -283,78 +283,74 @@ m4_define([AT_BISON_CHECK_NO_XML],
 [AT_CHECK(m4_if(m4_quote($2), [0], [], m4_quote($2), [], [],
                 [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
-              if test -f expout; then
-                mv expout at-bison-check-expout.bak
-              fi
-
-              # To avoid expanding it repeatedly, store specified stdout.
-              ]AT_DATA([expout], [$3])[
-
-              # Run with -Werror.
-              ]AT_CHECK(AT_QUELL_VALGRIND[[ bison ]$1[ -Werror]],
-                        [[1]], [expout], [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 ]$1[ --warnings=error]],
-                        [[1]], [expout], [experr])[
-
-              # Now check -Wnone and --warnings=none by making sure that
-              # -Werror doesn't change the exit status when -Wnone or
-              # --warnings=none is specified.
-              ]AT_CHECK(AT_QUELL_VALGRIND[[ bison ]$1[ -Wnone -Werror]],
-                        [[0]], [expout], [ignore])[
-              ]AT_CHECK(AT_QUELL_VALGRIND[[ bison ]$1[ --warnings=none \
-                        -Werror]], [[0]], [expout], [ignore])[
-
-              # Restore caller's files.
-              if test -f at-bison-check-expout.bak; then
-                mv at-bison-check-expout.bak expout
-              fi
-              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
-             ]])
-      ])
+      m4_quote(m4_if(m4_quote($2), [], [0], [$2])), [0], [[
+        # POSIXLY_CORRECT=1 causes bison to complain if options are added
+        # after the grammar file name, so skip these checks in that case.
+        if test x"$POSIXLY_CORRECT" != x1; then
+          # 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
+          if test -f expout; then mv expout at-bison-check-expout.bak; fi
+
+          # To avoid expanding it repeatedly, store specified stdout.
+          ]AT_DATA([expout], [$3])[
+
+          # Run with -Werror.
+          ]AT_CHECK(AT_QUELL_VALGRIND[[ bison ]$1[ -Werror]],
+                    [[1]], [expout], [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 ]$1[ --warnings=error]],
+                    [[1]], [expout], [experr])[
+
+          # Now check -Wnone and --warnings=none by making sure that
+          # -Werror doesn't change the exit status when -Wnone or
+          # --warnings=none is specified.
+          ]AT_CHECK(AT_QUELL_VALGRIND[[ bison ]$1[ -Wnone -Werror]],
+                    [[0]], [expout], [ignore])[
+          ]AT_CHECK(AT_QUELL_VALGRIND[[ bison ]$1[ --warnings=none \
+                    -Werror]], [[0]], [expout], [ignore])[
+
+          # Restore caller's files.
+          if test -f at-bison-check-expout.bak; then
+            mv at-bison-check-expout.bak expout
+          fi
+          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
+        fi
+      ]])
 ])
 
 # AT_BISON_CHECK_XML(BISON_ARGS, [OTHER_AT_CHECK_ARGS])