Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-20 17:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: factor the execution of Java parsers

Browse Source 
* tests/local.at (AT_MAIN_DEFINE(java)): Exit failure on failure.
(AT_PARSER_CHECK): If in Java, run AT_JAVA_PARSER_CHECK.
* tests/conflicts.at (AT_CONSISTENT_ERRORS_CHECK): Simplify.
This commit is contained in:
Akim Demaille
2019-02-21 06:39:13 +01:00
parent fbf94ac900
commit 967a59d2c0
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/conflicts.at
View File

@@ -461,14 +461,10 @@ m4_pushdef([AT_EXPECTING], [m4_if($5, [ab], [[, expecting 'a' or 'b']],
$5, [a], [[, expecting 'a']], $5, [a], [[, expecting 'a']],
$5, [b], [[, expecting 'b']])]) $5, [b], [[, expecting 'b']])])
AT_JAVA_IF([AT_JAVA_PARSER_CHECK([[input]], [[0]], AT_PARSER_CHECK([[input]], [[1]],
[[]], [[]],
[[syntax error, unexpected ]$4[]AT_EXPECTING[ [[syntax error, unexpected ]$4[]AT_EXPECTING[
]])], ]])
[AT_PARSER_CHECK([[input]], [[1]],
[[]],
[[syntax error, unexpected ]$4[]AT_EXPECTING[
]])])
m4_popdef([AT_EXPECTING]) m4_popdef([AT_EXPECTING])
AT_BISON_OPTION_POPDEFS AT_BISON_OPTION_POPDEFS

21
tests/local.at
View File

@@ -727,7 +727,7 @@ m4_define([AT_MAIN_DEFINE(java)],
public static void main (String args[]) throws IOException public static void main (String args[]) throws IOException
{ {
YYParser p = new YYParser (); YYParser p = new YYParser ();
p.parse (); System.exit (p.parse () ? 0 : 1);
} }
}]]) }]])
@@ -1020,7 +1020,7 @@ AT_COMPILE([c-only.o], [c-only.c])
AT_COMPILE_CXX([cxx-only.o], [cxx-only.cc]) AT_COMPILE_CXX([cxx-only.o], [cxx-only.cc])
AT_CHECK([$CXX $CXXFLAGS $CPPFLAGS $LDFLAGS c-only.o cxx-only.o -o c-and-cxx || AT_CHECK([$CXX $CXXFLAGS $CPPFLAGS $LDFLAGS c-only.o cxx-only.o -o c-and-cxx ||
exit 77], [0], [ignore], [ignore]) exit 77], [0], [ignore], [ignore])
AT_PARSER_CHECK([c-and-cxx]) AT_C_PARSER_CHECK([c-and-cxx])
]) ])
@@ -1104,13 +1104,13 @@ AT_CHECK([@&t@./exception || exit 77], [0], [], [ignore])
## ---------------------------- ## ## ---------------------------- ##
# AT_PARSER_CHECK(COMMAND, EXIT-STATUS, EXPOUT, EXPERR, [PRE]) # AT_C_PARSER_CHECK(COMMAND, EXIT-STATUS, EXPOUT, EXPERR, [PRE])
# ------------------------------------------------------------ # --------------------------------------------------------------
# So that we can run './testsuite PREPARSER='valgrind -q' for instance. # So that we can run './testsuite PREPARSER='valgrind -q' for instance.
# #
# Get rid of spurious messages when compiled with --coverage: # Get rid of spurious messages when compiled with --coverage:
# +profiling:/[...]/lib/fprintf.gcda:Merge mismatch for summaries # +profiling:/[...]/lib/fprintf.gcda:Merge mismatch for summaries
m4_define([AT_PARSER_CHECK], m4_define([AT_C_PARSER_CHECK],
[AT_CHECK([$5 $PREPARSER ./$1], [$2], [$3], [stderr]) [AT_CHECK([$5 $PREPARSER ./$1], [$2], [$3], [stderr])
AT_CHECK([sed >&2 -e '/^profiling:.*:Merge mismatch for summaries/d' stderr], AT_CHECK([sed >&2 -e '/^profiling:.*:Merge mismatch for summaries/d' stderr],
[0], [], [$4]) [0], [], [$4])
@@ -1123,6 +1123,17 @@ m4_define([AT_JAVA_PARSER_CHECK],
[AT_CHECK([$5[ $SHELL ../../../javaexec.sh ]$1], [$2], [$3], [$4])]) [AT_CHECK([$5[ $SHELL ../../../javaexec.sh ]$1], [$2], [$3], [$4])])
# AT_PARSER_CHECK(COMMAND, EXIT-STATUS, EXPOUT, EXPERR, [PRE])
# ------------------------------------------------------------
# If we know we are in Java (via AT_BISON_OPTION_PUSHDEFS/POPDEFS),
# run AT_JAVA_PARSER_CHECK, otherwise AT_C_PARSER_CHECK.
m4_define([AT_PARSER_CHECK],
[m4_ifdef([AT_JAVA_IF],
[AT_JAVA_IF([AT_JAVA_PARSER_CHECK($@)],
[AT_C_PARSER_CHECK($@)])],
[AT_C_PARSER_CHECK($@)])])
# AT_TEST_TABLES_AND_PARSE(TITLE, COND-VALUE, TEST-SPEC, # AT_TEST_TABLES_AND_PARSE(TITLE, COND-VALUE, TEST-SPEC,
# DECLS, GRAMMAR, INPUT, # DECLS, GRAMMAR, INPUT,
# BISON-STDERR, TABLES-OR-LAST-STATE, # BISON-STDERR, TABLES-OR-LAST-STATE,