tests: refactor for legibility.

* tests/local.at (AT_BISON_CHECK_WARNINGS, AT_BISON_CHECK_WARNINGS_):
New.
This commit is contained in:
Akim Demaille
2012-07-17 13:40:26 +02:00
parent a122efad8a
commit e4828e2384

View File

@@ -450,17 +450,16 @@ m4_define([AT_BISON_CHECK_],
[AT_CHECK(AT_QUELL_VALGRIND[[ bison ]]$@)]) [AT_CHECK(AT_QUELL_VALGRIND[[ bison ]]$@)])
# AT_BISON_CHECK_NO_XML(BISON_ARGS, [OTHER_AT_CHECK_ARGS]) # AT_BISON_CHECK_WARNINGS(BISON_ARGS, [OTHER_AT_CHECK_ARGS])
# -------------------------------------------------------- # ----------------------------------------------------------
# Same as AT_BISON_CHECK except don't perform XML/XSLT checks. This is useful # Check that warnings (if some are expected) are correctly
# when a tortured grammar's XML is known to be too large for xsltproc to # turned into errors with -Werror, etc.
# handle. m4_define([AT_BISON_CHECK_WARNINGS],
m4_define([AT_BISON_CHECK_NO_XML], [m4_if(m4_bregexp([$4], [: warning: ]), [-1], [],
[AT_CHECK(m4_if(m4_quote($2), [0], [], m4_quote($2), [], [], [m4_null_if([$2], [AT_BISON_CHECK_WARNINGS_($@)])])])
[AT_QUELL_VALGRIND ])[[bison ]]$@)
m4_if(m4_bregexp([$4], [: warning: ]), [-1], [], m4_define([AT_BISON_CHECK_WARNINGS_],
m4_quote(m4_if(m4_quote($2), [], [0], [$2])), [0], [[ [[# Defining POSIXLY_CORRECT causes bison to complain if options
# Defining POSIXLY_CORRECT causes bison to complain if options
# are added after the grammar file name, so skip these checks # are added after the grammar file name, so skip these checks
# in that case. # in that case.
if test -z "${POSIXLY_CORRECT+set}"; then if test -z "${POSIXLY_CORRECT+set}"; then
@@ -513,10 +512,18 @@ m4_if(m4_bregexp([$4], [: warning: ]), [-1], [],
]AT_BISON_CHECK_([$1[ --warnings=none -Werror]], [[0]], [expout])[ ]AT_BISON_CHECK_([$1[ --warnings=none -Werror]], [[0]], [expout])[
]AT_RESTORE_SPECIAL_FILES[ ]AT_RESTORE_SPECIAL_FILES[
fi fi]dnl
]])
]) ])
# 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_null_if([$2], [], [AT_QUELL_VALGRIND ])[[bison ]]$@)
AT_BISON_CHECK_WARNINGS($@)])
# AT_BISON_CHECK_XML(BISON_ARGS, [OTHER_AT_CHECK_ARGS]) # 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 # Run AT_BISON_CHECK's XML/XSLT checks if $BISON_TEST_XML=1 and $XSLTPROC is
@@ -565,6 +572,8 @@ m4_define([AT_BISON_CHECK_XML],
m4_define([AT_QUELL_VALGRIND], m4_define([AT_QUELL_VALGRIND],
[[[VALGRIND_OPTS="$VALGRIND_OPTS --leak-check=summary --show-reachable=no"; export VALGRIND_OPTS;]]]) [[[VALGRIND_OPTS="$VALGRIND_OPTS --leak-check=summary --show-reachable=no"; export VALGRIND_OPTS;]]])
## ------------------------ ## ## ------------------------ ##
## Compiling C, C++ Files. ## ## Compiling C, C++ Files. ##
## ------------------------ ## ## ------------------------ ##