tests: split a large test case into several smaller ones

* tests/conflicts.at (AT_CONSISTENT_ERRORS_CHECK): Move AT_SETUP/AT_CLEANUP
into it, so that we don't skip non Java tests following a test case in Java.

diff --git a/tests/conflicts.at b/tests/conflicts.at
index 819b992da1f1011b1d2f921a9352ae0131d07a1b..03b8fa20dbc0ffefdd00843d44842127c1044267 100644 (file)
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -393,10 +393,10 @@ AT_CLEANUP
 ## parse.error=verbose and consistent errors.  ##
 ## ------------------------------------------- ##
 
 ## parse.error=verbose and consistent errors.  ##
 ## ------------------------------------------- ##
 

-AT_SETUP([[parse.error=verbose and consistent errors]])
-

 m4_pushdef([AT_CONSISTENT_ERRORS_CHECK], [
 
 m4_pushdef([AT_CONSISTENT_ERRORS_CHECK], [
 

+AT_SETUP([[parse.error=verbose and consistent errors: $1]])
+

 AT_BISON_OPTION_PUSHDEFS([$1])
 
 m4_pushdef([AT_YYLEX_PROTOTYPE],
 AT_BISON_OPTION_PUSHDEFS([$1])
 
 m4_pushdef([AT_YYLEX_PROTOTYPE],


@@ -483,7 +483,11 @@ m4_popdef([AT_EXPECTING])
 m4_popdef([AT_YYLEX_PROTOTYPE])
 AT_BISON_OPTION_POPDEFS
 
 m4_popdef([AT_YYLEX_PROTOTYPE])
 AT_BISON_OPTION_POPDEFS
 

-])
+AT_CLEANUP
+]) dnl AT_CONSISTENT_ERRORS_CHECK
+
+
+

 
 m4_pushdef([AT_PREVIOUS_STATE_GRAMMAR],
 [[%nonassoc 'a';
 
 m4_pushdef([AT_PREVIOUS_STATE_GRAMMAR],
 [[%nonassoc 'a';


@@ -653,7 +657,6 @@ m4_popdef([AT_USER_ACTION_INPUT])
 
 m4_popdef([AT_CONSISTENT_ERRORS_CHECK])
 
 
 m4_popdef([AT_CONSISTENT_ERRORS_CHECK])
 

-AT_CLEANUP