X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/0e021770cc023c6a2e7ae132a3aab55bc7cbc058..798096e1deaeb13a06e62de5c73487537e220e3c:/tests/local.at diff --git a/tests/local.at b/tests/local.at index 3497c15d..59765c54 100644 --- a/tests/local.at +++ b/tests/local.at @@ -1,22 +1,20 @@ # Process this -*- Autotest -*- file with autom4te. # Macros for the GNU Bison Test suite. -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. -# This program is free software; you can redistribute it and/or modify +# 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 -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. - +# # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see . # We want a recent Autotest. m4_version_prereq([2.58]) @@ -52,19 +50,18 @@ m4_pushdef([AT_GLR_CC_IF], # Using yacc.c? m4_pushdef([AT_YACC_IF], [m4_bmatch([$3], [%language\|%glr-parser\|%skeleton], [$2], [$1])]) +m4_pushdef([AT_LEXPARAM_IF], +[m4_bmatch([$3], [%lex-param], [$1], [$2])]) m4_pushdef([AT_PARAM_IF], [m4_bmatch([$3], [%parse-param], [$1], [$2])]) m4_pushdef([AT_LOCATION_IF], [m4_bmatch([$3], [%locations], [$1], [$2])]) m4_pushdef([AT_PURE_IF], -[m4_bmatch([$3], [%pure-parser], [$1], [$2])]) -m4_pushdef([AT_PUSH_IF], -[m4_bmatch([$3], [%push-parser], [$1], [$2])]) -m4_pushdef([AT_PURE_OR_PUSH_IF], -[m4_bmatch([$3], [%pure-parser\|%push-parser], [$1], [$2])]) +[m4_bmatch([$3], [%define *api\.pure\|%pure-parser], + [m4_bmatch([$3], [%define *api\.pure *"false"], [$2], [$1])], + [$2])]) m4_pushdef([AT_PURE_AND_LOC_IF], -[m4_bmatch([$3], [%locations.*%pure-parser\|%pure-parser.*%locations], - [$1], [$2])]) +[m4_bmatch([$3], [%locations], [AT_PURE_IF($@)], [$2])]) m4_pushdef([AT_GLR_OR_PARAM_IF], [m4_bmatch([$3], [%glr-parser\|%parse-param], [$1], [$2])]) m4_pushdef([AT_NAME_PREFIX], @@ -76,17 +73,17 @@ m4_pushdef([AT_YYERROR_ARG_LOC_IF], [AT_GLR_OR_PARAM_IF([AT_PURE_AND_LOC_IF([$1], [$2])], [$2])]) # yyerror always sees the locations (when activated), except if -# push or (yacc & pure & !param). +# (yacc & pure & !param). FIXME: This is wrong. See the manual. m4_pushdef([AT_YYERROR_SEES_LOC_IF], -[AT_PUSH_IF([$2],[AT_LOCATION_IF([AT_YACC_IF([AT_PURE_IF([AT_PARAM_IF([$1], [$2])], +[AT_LOCATION_IF([AT_YACC_IF([AT_PURE_IF([AT_PARAM_IF([$1], [$2])], [$1])], [$1])], - [$2])])]) + [$2])]) -# The interface is pure: either because %pure-parser, or because we +# The interface is pure: either because %define api.pure, or because we # are using the C++ parsers. m4_pushdef([AT_PURE_LEX_IF], -[AT_PURE_OR_PUSH_IF([$1], +[AT_PURE_IF([$1], [AT_SKEL_CC_IF([$1], [$2])])]) AT_PURE_LEX_IF( @@ -132,6 +129,7 @@ m4_popdef([AT_GLR_OR_PARAM_IF]) m4_popdef([AT_PURE_AND_LOC_IF]) m4_popdef([AT_LOCATION_IF]) m4_popdef([AT_PARAM_IF]) +m4_popdef([AT_LEXPARAM_IF]) m4_popdef([AT_YACC_IF]) m4_popdef([AT_GLR_IF]) m4_popdef([AT_SKEL_CC_IF]) @@ -171,6 +169,79 @@ m4_define([AT_DATA_GRAMMAR], $2]) ]) +# AT_BISON_CHECK(BISON_ARGS, [OTHER_AT_CHECK_ARGS]) +# ------------------------------------------------- +# Check Bison by invoking `bison BISON_ARGS'. OTHER_AT_CHECK_ARGS are the +# usual remaining arguments to AT_CHECK: STATUS, STDOUT, etc. +# +# This macro or AT_BISON_CHECK_NO_XML should always be used whenever invoking +# Bison in the test suite. For now it ensures that: +# +# 1. Valgrind doesn't report reachable memory when Bison is expected to have +# a non-zero exit status since Bison doesn't always try to free all memory +# in that case. +# +# 2. In the case of maintainer-xml-check, XML/XSLT output is compared with +# --graph and --report=all output for every working grammar. +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($@)]) + +# 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 +# when a tortured grammar's XML is known to be too large for xsltproc to +# handle. +m4_define([AT_BISON_CHECK_NO_XML], +[AT_CHECK(m4_if(m4_quote($2), [0], [], m4_quote($2), [], [], + [AT_QUELL_VALGRIND ])[[bison ]]$@)]) + +# AT_BISON_CHECK_XML(BISON_ARGS, [OTHER_AT_CHECK_ARGS]) +# ----------------------------------------------------- +# Run AT_BISON_CHECK's XML/XSLT checks if $BISON_TEST_XML=1 and $XSLTPROC is +# defined. It doesn't make sense to invoke this macro if Bison is expected to +# have a non-zero exit status. +m4_define([AT_BISON_CHECK_XML], +[[if test x"$BISON_TEST_XML" = x1 && test x"$XSLTPROC" != x""; then + mkdir xml-tests] + m4_pushdef([AT_BISON_ARGS], + [m4_bpatsubsts([[$1]], + [--report(-file)?=[^][ ]*], [], + [--graph=[^][ ]*], [], + [--xml=[^][ ]*], [])])dnl + # Don't combine these Bison invocations since we want to be sure that + # --report=all isn't required to get the full XML file. + AT_CHECK([[bison --report=all --report-file=xml-tests/test.output \ + --graph=xml-tests/test.dot ]]AT_BISON_ARGS, + [[0]], [ignore], [ignore]) + AT_CHECK([[bison --xml=xml-tests/test.xml ]]AT_BISON_ARGS, + [[0]], [ignore], [ignore]) + m4_popdef([AT_BISON_ARGS])dnl + [cp xml-tests/test.output expout] + AT_CHECK([[$XSLTPROC \ + `]]AT_QUELL_VALGRIND[[ bison --print-datadir`/xslt/xml2text.xsl \ + xml-tests/test.xml]], [[0]], [expout]) + [cp xml-tests/test.dot expout] + AT_CHECK([[$XSLTPROC \ + `]]AT_QUELL_VALGRIND[[ bison --print-datadir`/xslt/xml2dot.xsl \ + xml-tests/test.xml]], [[0]], [expout]) + [rm -rf xml-tests expout +fi]]) + +# AT_QUELL_VALGRIND +# ----------------- +# Put this before a Bison invocation to keep Valgrind from complaining about +# reachable memory. +# +# Do not quote invocations of this macro within the first argument of AT_CHECK. +# The triple quoting below will cause test cases to fail if you do. If you do +# so anyway but also decrease the quoting below to avoid that problem, AT_CHECK +# will then fail to shell-escape its contents when attempting to print them. +# The testsuite verbose output, at least, will be incorrect, but nothing may +# fail to make sure you notice. +m4_define([AT_QUELL_VALGRIND], +[[[VALGRIND_OPTS="$VALGRIND_OPTS --leak-check=summary --show-reachable=no"; export VALGRIND_OPTS;]]]) ## ------------------------ ## ## Compiling C, C++ Files. ## @@ -202,11 +273,11 @@ AT_CHECK([$CXX $CXXFLAGS $CPPFLAGS m4_bmatch([$1], [[.]], [], [$LDFLAGS ])-o $1 ## Running a generated parser. ## ## ---------------------------- ## -# AT_PARSER_CHECK(COMMAND, EXIT-STATUS, EXPOUT, EXPERR) -# ----------------------------------------------------- +# AT_PARSER_CHECK(COMMAND, EXIT-STATUS, EXPOUT, EXPERR, [PRE]) +# ------------------------------------------------------------ # So that we can run `./testsuite PREPARSER='valgrind -q' for instance. m4_define([AT_PARSER_CHECK], -[AT_CHECK([$PREPARSER $1], [$2], [$3], [$4])]) +[AT_CHECK([$5 $PREPARSER $1], [$2], [$3], [$4])])