X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/d782395d52519fabb2cac3bd479246cc6de7efa8..d243e0241f79eed2b231fa9066a47f9daaafa82d:/tests/torture.at?ds=inline

diff --git a/tests/torture.at b/tests/torture.at
index e21c93dc..253041e6 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1,6 +1,7 @@
 # Torturing Bison.                                    -*- Autotest -*-
-# Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007 Free Software Foundation,
-# Inc.
+
+# Copyright (C) 2001-2002, 2004-2007, 2009-2012 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
@@ -88,9 +89,9 @@ for my $size (1 .. $max)
   {
     use Text::Wrap;
     print wrap ("| ", "   ",
-		(map { "\"$_\"" } (1 .. $size)),
-		" END \n"),
-		  "    { \$\$ = $size; }\n";
+                (map { "\"$_\"" } (1 .. $size)),
+                " END \n"),
+                  "    { \$\$ = $size; }\n";
   };
 print ";\n";
 
@@ -143,7 +144,7 @@ AT_SETUP([Big triangle])
 # With 500 and the new parser, which consume far too much memory,
 # it gets killed too.  Of course the parser is to be cleaned.
 AT_DATA_TRIANGULAR_GRAMMAR([input.y], [200])
-AT_CHECK([bison -v -o input.c input.y])
+AT_BISON_CHECK_NO_XML([-v -o input.c input.y])
 AT_COMPILE([input])
 AT_PARSER_CHECK([./input])
 
@@ -189,7 +190,7 @@ EOF
 use Text::Wrap;
 print
   wrap ("exp: ", "  ",
-	(map { "\"$_\"" } (1 .. $max)), ";"),
+        (map { "\"$_\"" } (1 .. $max)), ";"),
   "\n";
 
 print <<EOF;
@@ -249,7 +250,7 @@ AT_DATA_HORIZONTAL_GRAMMAR([input.y], [1000])
 # Ask for 200 MiB, which should be plenty even on a 64-bit host.
 AT_INCREASE_DATA_SIZE(204000)
 
-AT_CHECK([bison -v -o input.c input.y])
+AT_BISON_CHECK_NO_XML([-v -o input.c input.y])
 AT_COMPILE([input])
 AT_PARSER_CHECK([./input])
 
@@ -291,8 +292,8 @@ EOF
 
 print
   wrap ("%type <val> ",
-	"            ",
-	map { "n$_" } (1 .. $max)),
+        "            ",
+        map { "n$_" } (1 .. $max)),
   "\n";
 
 print "%token\n";
@@ -333,7 +334,7 @@ yylex (void)
   if (counter > $max)
     {
       if (counter++ != $max + 1)
-	abort ();
+        abort ();
       return 0;
     }
   if (return_token)
@@ -377,7 +378,7 @@ AT_DATA_LOOKAHEAD_TOKENS_GRAMMAR([input.y], [1000])
 # Ask for 200 MiB, which should be plenty even on a 64-bit host.
 AT_INCREASE_DATA_SIZE(204000)
 
-AT_CHECK([bison -v -o input.c input.y])
+AT_BISON_CHECK([-v -o input.c input.y])
 AT_COMPILE([input])
 AT_PARSER_CHECK([./input])
 
@@ -434,8 +435,8 @@ main (int argc, const char **argv)
     abort ();
   yylval_init = strtol (argv[1], &endp, 10);
   if (! (argv[1] != endp
-	 && 0 <= yylval_init && yylval_init <= INT_MAX
-	 && errno != ERANGE))
+         && 0 <= yylval_init && yylval_init <= INT_MAX
+         && errno != ERANGE))
     abort ();
   yydebug = 1;
   {
@@ -461,7 +462,7 @@ main (int argc, const char **argv)
   }
 }
 ]])
-AT_CHECK([bison -o input.c input.y])
+AT_BISON_CHECK([-o input.c input.y])
 AT_COMPILE([input])
 ])
 
@@ -496,7 +497,7 @@ AT_PARSER_CHECK([./input 10000], 2, [], [ignore],
 # just helps guarantee we don't let the YYSTACK_USE_ALLOCA feature affect
 # push parsers.
 AT_DATA_STACK_TORTURE([AT_USE_ALLOCA],
-[[%define push_pull "both"
+[[%define api.push-pull both
 ]])
 AT_PARSER_CHECK([./input 20], 0, [], [ignore],
                 [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
@@ -534,7 +535,7 @@ AT_PARSER_CHECK([./input 10000], 2, [], [ignore],
                 [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
 
 AT_DATA_STACK_TORTURE([AT_USE_ALLOCA],
-[[%define push_pull "both"
+[[%define api.push-pull both
 ]])
 AT_PARSER_CHECK([./input 20], 0, [], [ignore],
                 [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])