]> git.saurik.com Git - bison.git/blobdiff - tests/local.at
NEWS: Update.
[bison.git] / tests / local.at
index dea5ed4dc57c998416826a4d1674b00768694467..d651eb9564ff49db238d1e3e4fcc9a4983014f51 100644 (file)
@@ -2,7 +2,7 @@
 
 # Macros for the GNU Bison Test suite.
 
-# Copyright (C) 2003-2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 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
@@ -278,78 +278,78 @@ 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], [[
+        # Defining POSIXLY_CORRECT causes bison to complain if options
+        # are added after the grammar file name, so skip these checks
+        # in that case.
+        if test -z "${POSIXLY_CORRECT+set}"; 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: /{=;q;}' at-bison-check-warnings`
+          : ${at_bison_check_first:=1}
+          at_bison_check_first_tmp=`sed -n \
+            '/conflicts: [0-9].*reduce$/{=;q;}' at-bison-check-warnings`
+          : ${at_bison_check_first_tmp:=1}
+          if test $at_bison_check_first_tmp -lt $at_bison_check_first; then
+            at_bison_check_first=$at_bison_check_first_tmp
+          fi
+          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`
+          : ${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 \
+            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])[
+          ]AT_CHECK(AT_QUELL_VALGRIND[[ bison ]$1[ --warnings=none \
+                    -Werror]], [[0]], [expout])[
+
+          # 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])
@@ -610,6 +610,17 @@ m4_if(m4_index(m4_quote($3), [last-state]), -1,
 
 $9
 
+# Canonical LR generates very large tables, resulting in very long
+# files with #line directives that may overflow what the standards
+# (C90 and C++98) guarantee: 32767.  In that case, GCC's -pedantic
+# will issue an error.
+#
+# There is no "" around `wc` since some indent the result.
+m4_bmatch([$4], [%define lr.type canonical-lr],
+[if test 32767 -lt `wc -l < input.c`; then
+  CFLAGS=`echo " $CFLAGS " | sed -e 's/ -pedantic //'`
+  CXXFLAGS=`echo " $CXXFLAGS " | sed -e 's/ -pedantic //'`
+fi])
 AT_COMPILE([[input]])
 
 AT_PARSER_CHECK([[./input]],
@@ -629,4 +640,15 @@ m4_popdef([AT_COND_CASE])])
 
 AT_INIT
 
+# Cannot assign CC and CFLAGS here, since atlocal is loaded after
+# options are processed, so we don't know the value of CXX and
+# CXXFLAGS yet.
+#
+# Note that it also means that command line values for CXX and
+# CXXFLAGS will not be propagated to CC and CFLAGS.
+AT_ARG_OPTION([compile-c-with-cxx],
+              [compile C parsers with the C++ compiler])
+
+AT_COLOR_TESTS
+
 AT_TESTED([bison])