X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/03c07b039448552b5ac6c51076b88c2f15b0307f..7fb72c6e53f25f2d0b10fc9e0b412b8c7cde9101:/tests/local.at diff --git a/tests/local.at b/tests/local.at index 91e0f20e..65e528f9 100644 --- a/tests/local.at +++ b/tests/local.at @@ -1,8 +1,8 @@ # Process this -*- Autotest -*- file with autom4te. # Macros for the GNU Bison Test suite. -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 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 @@ -37,10 +37,56 @@ printf "$count\n";' $1], [0], [$3 ])]) +# AT_SAVE_SPECIAL_FILES / AT_RESTORE_SPECIAL_FILES +# ------------------------------------------------ +# Don't interfere with caller's files. +m4_divert_text([PREPARE_TESTS], +[at_save_special_files () +{ + for at_save_file in stderr experr expout + do + test ! -f $at_save_file || mv $at_save_file at-bison-check-$at_save_file.bak + done +} + +at_restore_special_files () +{ + for at_save_file in stderr experr expout + do + test ! -f at-bison-check-$at_save_file.bak || + mv at-bison-check-$at_save_file.bak $at_save_file + done +} +]) + +m4_define([AT_SAVE_SPECIAL_FILES], [at_save_special_files]) +m4_define([AT_RESTORE_SPECIAL_FILES], [at_restore_special_files]) + + + ## ------------------------------- ## ## Macros decoding Bison options. ## ## ------------------------------- ## +# AT_LOC_PUSHDEF(FIRST-LINE, FIRST-COLUMN, LAST-LINE, LAST-COLUMN) +# ---------------------------------------------------------------- +# Pushdef AT_LOC_(FIRST|LAST)_(LINE|COLUMN). +m4_define([AT_LOC_PUSHDEF], +[m4_pushdef([AT_LOC_FIRST_LINE], [AT_LOC.$1]) +m4_pushdef([AT_LOC_FIRST_COLUMN], [AT_LOC.$2]) +m4_pushdef([AT_LOC_LAST_LINE], [AT_LOC.$3]) +m4_pushdef([AT_LOC_LAST_COLUMN], [AT_LOC.$4])]) + +# AT_LOC_POPDEF +# ------------- +# Popdef AT_LOC_(FIRST|LAST)_(LINE|COL). +m4_define([AT_LOC_POPDEF], +[m4_popdef([AT_LOC_FIRST_LINE]) +m4_popdef([AT_LOC_FIRST_COLUMN]) +m4_popdef([AT_LOC_LAST_LINE]) +m4_popdef([AT_LOC_LAST_COLUMN])]) + + # AT_BISON_OPTION_PUSHDEFS([BISON-OPTIONS]) # ----------------------------------------- @@ -60,6 +106,8 @@ m4_pushdef([AT_DEFINES_IF], [m4_bmatch([$3], [%defines], [$1], [$2])]) m4_pushdef([AT_SKEL_CC_IF], [m4_bmatch([$3], [%language "[Cc]\+\+"\|%skeleton "[a-z0-9]+\.cc"], [$1], [$2])]) +m4_pushdef([AT_SKEL_JAVA_IF], +[m4_bmatch([$3], [%language "[Jj][Aa][Vv][Aa]"\|%skeleton "[a-z0-9]+\.java"], [$1], [$2])]) m4_pushdef([AT_GLR_IF], [m4_bmatch([$3], [%glr-parser\|%skeleton "glr\.], [$1], [$2])]) m4_pushdef([AT_LALR1_CC_IF], @@ -71,13 +119,15 @@ 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_LOCATION_TYPE_IF], +[m4_bmatch([$3], [%define location_type], [$1], [$2])]) +m4_pushdef([AT_PARAM_IF], +[m4_bmatch([$3], [%parse-param], [$1], [$2])]) m4_pushdef([AT_PURE_IF], [m4_bmatch([$3], [%define *api\.pure\|%pure-parser], - [m4_bmatch([$3], [%define *api\.pure *"false"], [$2], [$1])], + [m4_bmatch([$3], [%define *api\.pure *"?false"?], [$2], [$1])], [$2])]) m4_pushdef([AT_PURE_AND_LOC_IF], [m4_bmatch([$3], [%locations], [AT_PURE_IF($@)], [$2])]) @@ -127,6 +177,15 @@ AT_PURE_LEX_IF( m4_pushdef([AT_LEX_PRE_FORMALS], []) m4_pushdef([AT_LEX_PRE_ARGS], []) ]) + +# Handle the different types of location components. + +AT_SKEL_CC_IF( + [AT_LOCATION_TYPE_IF( + [AT_LOC_PUSHDEF([first.l], [first.c], [last.l], [last.c])], + [AT_LOC_PUSHDEF([begin.line], [begin.column], [end.line], [end.column])])], + [AT_LOC_PUSHDEF([first_line], [first_column], [last_line], [last_column])]) + ])# _AT_BISON_OPTION_PUSHDEFS @@ -146,15 +205,18 @@ m4_popdef([AT_YYERROR_ARG_LOC_IF]) m4_popdef([AT_NAME_PREFIX]) m4_popdef([AT_GLR_OR_PARAM_IF]) m4_popdef([AT_PURE_AND_LOC_IF]) +m4_popdef([AT_LOCATION_TYPE_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]) +m4_popdef([AT_SKEL_JAVA_IF]) m4_popdef([AT_GLR_CC_IF]) m4_popdef([AT_LALR1_CC_IF]) m4_popdef([AT_DEFINES_IF]) +AT_LOC_POPDEF ])# AT_BISON_OPTION_POPDEFS @@ -207,8 +269,10 @@ $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. +# Check Bison by invoking `bison BISON_ARGS'. BISON_ARGS should not contain +# shell constructs (such as redirection or pipes) that would prevent +# appending additional command-line arguments for bison. 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: @@ -219,11 +283,19 @@ $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. +# +# 4. If stderr contains a warning, -Wnone and --warnings=none suppress it. 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 @@ -231,7 +303,69 @@ 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_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 + ]AT_SAVE_SPECIAL_FILES[ + + # 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])[ + + ]AT_RESTORE_SPECIAL_FILES[ + fi + ]]) +]) # AT_BISON_CHECK_XML(BISON_ARGS, [OTHER_AT_CHECK_ARGS]) # ----------------------------------------------------- @@ -239,8 +373,9 @@ m4_define([AT_BISON_CHECK_NO_XML], # 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] +[[if test x"$BISON_TEST_XML" = x1 && test x"$XSLTPROC" != x""; then] + AT_SAVE_SPECIAL_FILES + [mkdir xml-tests] m4_pushdef([AT_BISON_ARGS], [m4_bpatsubsts([[$1]], [--report(-file)?=[^][ ]*], [], @@ -262,8 +397,9 @@ m4_define([AT_BISON_CHECK_XML], AT_CHECK([[$XSLTPROC \ `]]AT_QUELL_VALGRIND[[ bison --print-datadir`/xslt/xml2dot.xsl \ xml-tests/test.xml]], [[0]], [expout]) - [rm -rf xml-tests expout -fi]]) + [rm -rf xml-tests expout] + AT_RESTORE_SPECIAL_FILES +[fi]]) # AT_QUELL_VALGRIND # ----------------- @@ -303,19 +439,38 @@ AT_CHECK([$BISON_CXX_WORKS], 0, ignore, ignore) AT_CHECK([$CXX $CXXFLAGS $CPPFLAGS m4_bmatch([$1], [[.]], [], [$LDFLAGS ])-o $1 m4_default([$2], [$1.cc])[]m4_bmatch([$1], [[.]], [], [ $LIBS])], 0, [ignore], [ignore])]) +# AT_JAVA_COMPILE(SOURCES) +# ------------------------ +# Compile SOURCES into Java class files. Skip the test if java or javac +# is not installed. +m4_define([AT_JAVA_COMPILE], +[AT_KEYWORDS(java) +AT_CHECK([[test -n "$CONF_JAVA" || exit 77 + test -n "$CONF_JAVAC" || exit 77]]) +AT_CHECK([[$SHELL ../../../javacomp.sh ]$1], + [[0]], [ignore], [ignore])]) # AT_FULL_COMPILE(OUTPUT, [OTHER]) # -------------------------------- -# Compile OUTPUT.y to OUTPUT.c or OUTPUT.cc, and compile it to OUTPUT. -# If OTHER is specified, compile OUTPUT-OTHER.c or OUTPUT-OTHER.cc to OUTPUT -# along with it. -# Relies on AT_SKEL_CC_IF. -m4_define([AT_FULL_COMPILE], -[AT_SKEL_CC_IF( - [AT_BISON_CHECK([-o $1.cc $1.y]) - AT_COMPILE_CXX([$1]m4_ifval($2, [, [$1.cc $1-$2.cc]]))], - [AT_BISON_CHECK([-o $1.c $1.y]) - AT_COMPILE([$1]m4_ifval($2, [, [$1.c $1-$2.c]]))]) +# Compile OUTPUT.y to OUTPUT.c, OUTPUT.cc, or OUTPUT.java, and then +# compile it to OUTPUT or OUTPUT.class. If OTHER is specified, compile +# OUTPUT-OTHER.c, OUTPUT-OTHER.cc, or OUTPUT-OTHER.java to OUTPUT or +# OUTPUT.java along with it. Relies on AT_SKEL_CC_IF and +# AT_SKEL_JAVA_IF. +m4_define([AT_FULL_COMPILE], [ + AT_SKEL_JAVA_IF([ + AT_BISON_CHECK([[-o ]$1[.java ]$1[.y]]) + AT_JAVA_COMPILE([$1[.java]]m4_ifval($2, + [[$1[.java ]$1[-]$2[.java]]])) + ], [ + AT_SKEL_CC_IF([ + AT_BISON_CHECK([[-o ]$1[.cc ]$1[.y]]) + AT_COMPILE_CXX([$1]m4_ifval($2, [, [$1[.cc ]$1[-]$2[.cc]]])) + ], [ + AT_BISON_CHECK([[-o ]$1[.c ]$1[.y]]) + AT_COMPILE([$1]m4_ifval($2, [, [$1[.c ]$1[-]$2[.c]]])) + ]) + ]) ]) @@ -323,11 +478,25 @@ m4_define([AT_FULL_COMPILE], ## Running a generated parser. ## ## ---------------------------- ## + # AT_PARSER_CHECK(COMMAND, EXIT-STATUS, EXPOUT, EXPERR, [PRE]) # ------------------------------------------------------------ # So that we can run `./testsuite PREPARSER='valgrind -q' for instance. +# +# Get rid of spurious messages when compiled with --coverage: +# +profiling:/[...]/lib/fprintf.gcda:Merge mismatch for summaries m4_define([AT_PARSER_CHECK], -[AT_CHECK([$5 $PREPARSER $1], [$2], [$3], [$4])]) +[AT_CHECK([$5 $PREPARSER $1], [$2], [$3], [stderr]) +AT_CHECK([sed >&2 -e '/^profiling:.*:Merge mismatch for summaries/d' stderr], + [0], [], [$4]) +]) + + +# AT_JAVA_PARSER_CHECK(COMMAND, EXIT-STATUS, EXPOUT, EXPERR, [PRE]) +# ----------------------------------------------------------------- +m4_define([AT_JAVA_PARSER_CHECK], +[AT_CHECK([$5[ $SHELL ../../../javaexec.sh ]$1], [$2], [$3], [$4])]) + # AT_TEST_TABLES_AND_PARSE(TITLE, COND-VALUE, TEST-SPEC, # DECLS, GRAMMAR, INPUT, @@ -405,12 +574,9 @@ m4_define([AT_PARSER_CHECK], # [[syntax error, unexpected 'b', expecting $end # ]])]) m4_define([AT_TEST_TABLES_AND_PARSE], -[_AT_TEST_TABLES_AND_PARSE($[1], $[@], $@)]) - -m4_define([_AT_TEST_TABLES_AND_PARSE], -[m4_pushdef([AT_COND_CASE], [m4_case([$4], $][@)]) +[m4_pushdef([AT_COND_CASE], [m4_case([$2], $][@)]) -AT_SETUP([$3]) +AT_SETUP([$1]) AT_DATA_GRAMMAR([[input.y]], [[%code { @@ -419,11 +585,11 @@ AT_DATA_GRAMMAR([[input.y]], static int yylex (void); } -]$6[ +]$4[ %% -]$7[ +]$5[ %% @@ -437,7 +603,7 @@ static int yylex (void) { static int const input[] = { - ]m4_if([$8], [], [], [$8], [[]], [], [$8[, ]])[0 + ]m4_if([$6], [], [], [$6], [[]], [], [$6[, ]])[0 }; static int const *inputp = input; return *inputp++; @@ -450,40 +616,43 @@ main (void) } ]]) -# AT_CHECK invokes AS_ESCAPE before expanding macros, so it corrupts some -# special characters in the macros. To avoid this, expand now and pass it -# the result with proper string quotation. Assume args 9 thru 14 expand to -# properly quoted strings. +# In some versions of Autoconf, AT_CHECK invokes AS_ESCAPE before +# expanding macros, so it corrupts some special characters in the +# macros. To avoid this, expand now and pass it the result with proper +# string quotation. Assume args 7 thru 12 expand to properly quoted +# strings. -# Pass plenty of options, to exercise plenty of code, even if we -# don't actually check the output. But SEGV is watching us, and -# so might do dmalloc. -m4_if(m4_index(m4_quote($5), [no-xml]), -1, +m4_if(m4_index(m4_quote($3), [no-xml]), -1, [AT_BISON_CHECK], [AT_BISON_CHECK_NO_XML])([[--report=all --defines -o input.c input.y]], - [0], [], m4_dquote($9)) + [0], [], m4_dquote($7)) -# Sigh. Some M4's can't reference arg 10 directly. -m4_pushdef([arg10], m4_car(m4_shiftn(9, $@))) -m4_if(m4_index(m4_quote($5), [last-state]), -1, +m4_if(m4_index(m4_quote($3), [last-state]), -1, [AT_CHECK([[sed -n '/^state 0$/,$p' input.output]], [[0]], - m4_dquote(arg10))], + m4_dquote($8))], [AT_CHECK([[sed -n 's/^state //p' input.output | tail -1]], [[0]], - m4_dquote(arg10)[[ + m4_dquote($8)[[ ]])]) -m4_popdef([arg10]) -m4_if($#, 10, [], m4_car(m4_shiftn(10, $@))) +$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]]) -m4_pushdef([AT_EXPAND_ARGS], [$][*]) -m4_pushdef([AT_DQUOTE_EACH], [[[$1]]m4_if($][#, 1, [], [, AT_DQUOTE_EACH(m4_shift($2))])]) - -AT_PARSER_CHECK([[./input]]m4_if($#, 10, [], $#, 11, [], [, AT_DQUOTE_EACH(AT_EXPAND_ARGS(m4_shiftn(11, $@)))])) - -m4_popdef([AT_DQUOTE_EACH]) -m4_popdef([AT_EXPAND_ARGS]) +AT_PARSER_CHECK([[./input]], + m4_ifval([$10], [m4_dquote($10)]), + m4_ifval([$11], [m4_dquote($11)]), + m4_ifval([$12], [m4_dquote($12)])) AT_CLEANUP @@ -497,4 +666,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])