tests: minor change to make it easier to test other skeletons

* tests/c++.at (Variants): Pass the skeleton as argument.

diff --git a/tests/c++.at b/tests/c++.at
index 96f2ac1d261c33ebc0612ca1de780ba71681da68..e4c527c1f36e4e1c47d2e31e2d7d96a4af9de66f 100644 (file)
--- a/tests/c++.at
+++ b/tests/c++.at
@@ -174,11 +174,10 @@ AT_CLEANUP
 m4_pushdef([AT_TEST],
 [AT_SETUP([Variants $1])
 
 m4_pushdef([AT_TEST],
 [AT_SETUP([Variants $1])
 

-AT_BISON_OPTION_PUSHDEFS([%skeleton "lalr1.cc" %debug $1])
+AT_BISON_OPTION_PUSHDEFS([%debug $1])

 # Store strings and integers in a list of strings.
 AT_DATA_GRAMMAR([list.y],
 [[%debug
 # Store strings and integers in a list of strings.
 AT_DATA_GRAMMAR([list.y],
 [[%debug

-%skeleton "lalr1.cc"

 %define api.value.type variant
 ]m4_bpatsubst([$1], [\\n], [
 ])[
 %define api.value.type variant
 ]m4_bpatsubst([$1], [\\n], [
 ])[


@@ -320,13 +319,13 @@ AT_BISON_OPTION_POPDEFS
 AT_CLEANUP
 ])
 
 AT_CLEANUP
 ])
 

-AT_TEST([])
-AT_TEST([%define parse.assert])
-AT_TEST([%locations %define parse.assert])
-AT_TEST([[%define parse.assert %code {\n#define TWO_STAGE_BUILD\n}]])
-AT_TEST([[%define parse.assert %define api.token.constructor]])
-AT_TEST([[%define parse.assert %define api.token.constructor %define api.token.prefix {TOK_}]])
-AT_TEST([[%locations %define parse.assert %define api.token.constructor %define api.token.prefix {TOK_}]])
+AT_TEST([[%skeleton "lalr1.cc" ]])
+AT_TEST([[%skeleton "lalr1.cc" %define parse.assert]])
+AT_TEST([[%skeleton "lalr1.cc" %locations %define parse.assert]])
+AT_TEST([[%skeleton "lalr1.cc" %define parse.assert %code {\n#define TWO_STAGE_BUILD\n}]])
+AT_TEST([[%skeleton "lalr1.cc" %define parse.assert %define api.token.constructor]])
+AT_TEST([[%skeleton "lalr1.cc" %define parse.assert %define api.token.constructor %define api.token.prefix {TOK_}]])
+AT_TEST([[%skeleton "lalr1.cc" %locations %define parse.assert %define api.token.constructor %define api.token.prefix {TOK_}]])

 
 m4_popdef([AT_TEST])
 
 
 m4_popdef([AT_TEST])