muscle: factor conditionals on defined %define variables

[bison.git] / tests / skeletons.at

diff --git a/tests/skeletons.at b/tests/skeletons.at
index ec8170ca72391cb60a5ec97326dffae318fa7b0b..68a004ec5109dc0f5e66e33956ed8c16d4064892 100644 (file)
--- a/tests/skeletons.at
+++ b/tests/skeletons.at
@@ -1,6 +1,6 @@
 # Checking skeleton support.                     -*- Autotest -*-
 
 # Checking skeleton support.                     -*- Autotest -*-
 

-# Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2013 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
 
 # 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


@@ -106,18 +106,13 @@ yylex (void)
 {
   return 'a';
 }
 {
   return 'a';
 }

-
-int
-main (void)
-{
-  return yyparse ();
-}
+]AT_MAIN_DEFINE[

 ]])
 
 ]])
 

-AT_DATA([[input-cmd-line.y]],
+AT_DATA_GRAMMAR([[input-cmd-line.y]],

 [AT_GRAM])
 
 [AT_GRAM])
 

-AT_DATA([[input-gram.y]],
+AT_DATA_GRAMMAR([[input-gram.y]],

 [[%skeleton "yacc.c"]
 AT_GRAM])
 
 [[%skeleton "yacc.c"]
 AT_GRAM])
 


@@ -191,8 +186,8 @@ start: ;
 ]])
 
 AT_BISON_CHECK([[input1.y]], [[1]], [[]],
 ]])
 
 AT_BISON_CHECK([[input1.y]], [[1]], [[]],

-[[input1.y: warning: foow fubar
-foow.y:2.3-5.3: warning: foowat fubar
+[[input1.y: warning: foow fubar [-Wother]
+foow.y:2.3-5.3: warning: foowat fubar [-Wother]

 input1.y: error: fooc fubar
 fooc.y:1.1-10.5: error: foocat fubar
 input1.y: fatal error: foof fubar
 input1.y: error: fooc fubar
 fooc.y:1.1-10.5: error: foocat fubar
 input1.y: fatal error: foof fubar


@@ -281,7 +276,7 @@ start: ;
 ]])
 
 AT_BISON_CHECK([[input2.y]], [[1]], [[]],
 ]])
 
 AT_BISON_CHECK([[input2.y]], [[1]], [[]],

-[[input2.y: warning: morning
+[[input2.y: warning: morning [-Wother]

 foo.y:1.5-6: fatal error: M4 should exit immediately here
 ]])
 
 foo.y:1.5-6: fatal error: M4 should exit immediately here
 ]])
 


@@ -315,7 +310,7 @@ print '@output(@,@)', "\n";
 (print "garbage"x10, "\n") for (1..1000);
 print "${M4}_divert_pop(0)\n";
 ]])
 (print "garbage"x10, "\n") for (1..1000);
 print "${M4}_divert_pop(0)\n";
 ]])

-AT_CHECK([[perl gen-skel.pl > skel.c || exit 77]])
+AT_CHECK([[$PERL gen-skel.pl > skel.c || exit 77]])

 
 AT_DATA([[input.y]],
 [[%skeleton "./skel.c"
 
 AT_DATA([[input.y]],
 [[%skeleton "./skel.c"