Update gnulib.

[bison.git] / tests / torture.at

diff --git a/tests/torture.at b/tests/torture.at
index ff373c21486115c6f668525a097ca65ae01bea25..753fc919f7aa6cdb0d657dcd5abefea25313c85c 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1,20 +1,19 @@
 # Torturing Bison.                                    -*- Autotest -*-
 # Torturing Bison.                                    -*- Autotest -*-

-# Copyright (C) 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007 Free Software Foundation,
+# Inc.

 
 

-# This program is free software; you can redistribute it and/or modify
+# 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
 # it under the terms of the GNU General Public License as published by

-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#

 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-
+#

 # You should have received a copy of the GNU General Public License
 # You should have received a copy of the GNU General Public License

-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 
 AT_BANNER([[Torture Tests.]])
 
 
 AT_BANNER([[Torture Tests.]])
 


@@ -144,7 +143,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])
 # 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])
 
 AT_COMPILE([input])
 AT_PARSER_CHECK([./input])
 


@@ -199,10 +198,11 @@ static int
 yylex (void)
 {
   static int counter = 1;
 yylex (void)
 {
   static int counter = 1;

-  if (counter > $max)
-    return 0;
-  else
-  return counter++;
+  if (counter <= $max)
+    return counter++;
+  if (counter++ != $max + 1)
+    abort ();
+  return 0;

 }
 
 static void
 }
 
 static void


@@ -249,7 +249,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)
 
 # 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])
 
 AT_COMPILE([input])
 AT_PARSER_CHECK([./input])
 


@@ -257,11 +257,11 @@ AT_CLEANUP
 
 
 
 
 
 

-# AT_DATA_LOOK_AHEAD_TOKENS_GRAMMAR(FILE-NAME, SIZE)
+# AT_DATA_LOOKAHEAD_TOKENS_GRAMMAR(FILE-NAME, SIZE)

 # --------------------------------------------------
 # Create FILE-NAME, containing a self checking parser for a grammar
 # --------------------------------------------------
 # Create FILE-NAME, containing a self checking parser for a grammar

-# requiring SIZE look-ahead tokens.
-m4_define([AT_DATA_LOOK_AHEAD_TOKENS_GRAMMAR],
+# requiring SIZE lookahead tokens.
+m4_define([AT_DATA_LOOKAHEAD_TOKENS_GRAMMAR],

 [AT_DATA([[gengram.pl]],
 [[#! /usr/bin/perl -w
 
 [AT_DATA([[gengram.pl]],
 [[#! /usr/bin/perl -w
 


@@ -331,7 +331,11 @@ yylex (void)
   static int return_token = 1;
   static int counter = 1;
   if (counter > $max)
   static int return_token = 1;
   static int counter = 1;
   if (counter > $max)

-    return 0;
+    {
+      if (counter++ != $max + 1)
+       abort ();
+      return 0;
+    }

   if (return_token)
     {
       return_token = 0;
   if (return_token)
     {
       return_token = 0;


@@ -362,18 +366,18 @@ mv stdout $1
 
 
 ## ------------------------ ##
 
 
 ## ------------------------ ##

-## Many look-ahead tokens.  ##
+## Many lookahead tokens.   ##

 ## ------------------------ ##
 
 ## ------------------------ ##
 

-AT_SETUP([Many look-ahead tokens])
+AT_SETUP([Many lookahead tokens])

 
 

-AT_DATA_LOOK_AHEAD_TOKENS_GRAMMAR([input.y], [1000])
+AT_DATA_LOOKAHEAD_TOKENS_GRAMMAR([input.y], [1000])

 
 # GNU m4 requires about 70 MiB for this test on a 32-bit host.
 # Ask for 200 MiB, which should be plenty even on a 64-bit host.
 AT_INCREASE_DATA_SIZE(204000)
 
 
 # GNU m4 requires about 70 MiB for this test on a 32-bit host.
 # 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])
 
 AT_COMPILE([input])
 AT_PARSER_CHECK([./input])
 


@@ -381,8 +385,8 @@ AT_CLEANUP
 
 
 
 
 
 

-# AT_DATA_STACK_TORTURE(C-PROLOGUE)
-# ---------------------------------
+# AT_DATA_STACK_TORTURE(C-PROLOGUE, [BISON-DECLS])
+# ------------------------------------------------

 # A parser specialized in torturing the stack size.
 m4_define([AT_DATA_STACK_TORTURE],
 [# A grammar of parens growing the stack thanks to right recursion.
 # A parser specialized in torturing the stack size.
 m4_define([AT_DATA_STACK_TORTURE],
 [# A grammar of parens growing the stack thanks to right recursion.


@@ -397,6 +401,7 @@ AT_DATA([input.y],
   static int yylex (void);
   static void yyerror (const char *msg);
 %}
   static int yylex (void);
   static void yyerror (const char *msg);
 %}

+]$2[

 %error-verbose
 %debug
 %token WAIT_FOR_EOF
 %error-verbose
 %debug
 %token WAIT_FOR_EOF


@@ -412,6 +417,8 @@ yyerror (const char *msg)
 static int
 yylex (void)
 {
 static int
 yylex (void)
 {

+  if (yylval < 0)
+    abort ();

   if (yylval--)
     return WAIT_FOR_EOF;
   else
   if (yylval--)
     return WAIT_FOR_EOF;
   else


@@ -422,18 +429,39 @@ int
 main (int argc, const char **argv)
 {
   char *endp;
 main (int argc, const char **argv)
 {
   char *endp;

+  YYSTYPE yylval_init;

   if (argc != 2)
     abort ();
   if (argc != 2)
     abort ();

-  yylval = strtol (argv[1], &endp, 10);
+  yylval_init = strtol (argv[1], &endp, 10);

   if (! (argv[1] != endp
   if (! (argv[1] != endp

-        && 0 <= yylval && yylval <= INT_MAX
+        && 0 <= yylval_init && yylval_init <= INT_MAX

         && errno != ERANGE))
     abort ();
   yydebug = 1;
         && errno != ERANGE))
     abort ();
   yydebug = 1;

-  return yyparse ();
+  {
+    int count;
+    int status;
+]m4_bmatch([$2], [%push-],
+[[    yypstate *ps = yypstate_new ();
+]])[    for (count = 0; count < 2; ++count)
+      {
+        int new_status;
+        yylval = yylval_init;
+]m4_bmatch([$2], [%push-],
+[[        new_status = yypull_parse (ps);
+]],
+[[        new_status = yyparse ();
+]])[        if (count > 0 && new_status != status)
+          abort ();
+        status = new_status;
+      }
+]m4_bmatch([$2], [%push-],
+[[    yypstate_delete (ps);
+]])[    return status;
+  }

 }
 ]])
 }
 ]])

-AT_CHECK([bison -o input.c input.y])
+AT_BISON_CHECK([-o input.c input.y])

 AT_COMPILE([input])
 ])
 
 AT_COMPILE([input])
 ])
 


@@ -444,20 +472,40 @@ AT_COMPILE([input])
 
 AT_SETUP([Exploding the Stack Size with Alloca])
 
 
 AT_SETUP([Exploding the Stack Size with Alloca])
 

-AT_DATA_STACK_TORTURE([[
+m4_pushdef([AT_USE_ALLOCA], [[

 #if (defined __GNUC__ || defined __BUILTIN_VA_ARG_INCR \
      || defined _AIX || defined _MSC_VER || defined _ALLOCA_H)
 # define YYSTACK_USE_ALLOCA 1
 #endif
 ]])
 
 #if (defined __GNUC__ || defined __BUILTIN_VA_ARG_INCR \
      || defined _AIX || defined _MSC_VER || defined _ALLOCA_H)
 # define YYSTACK_USE_ALLOCA 1
 #endif
 ]])
 

+AT_DATA_STACK_TORTURE([AT_USE_ALLOCA])
+

 # Below the limit of 200.
 # Below the limit of 200.

-AT_PARSER_CHECK([./input 20], 0, [], [ignore])
+AT_PARSER_CHECK([./input 20], 0, [], [ignore],
+                [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])

 # Two enlargements: 2 * 2 * 200.
 # Two enlargements: 2 * 2 * 200.

-AT_PARSER_CHECK([./input 900], 0, [], [ignore])
+AT_PARSER_CHECK([./input 900], 0, [], [ignore],
+                [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])

 # Fails: beyond the limit of 10,000 (which we don't reach anyway since we
 # multiply by two starting at 200 => 5120 is the last possible).
 # Fails: beyond the limit of 10,000 (which we don't reach anyway since we
 # multiply by two starting at 200 => 5120 is the last possible).

-AT_PARSER_CHECK([./input 10000], 2, [], [ignore])
+AT_PARSER_CHECK([./input 10000], 2, [], [ignore],
+                [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
+
+# The push parser can't use alloca since the stacks can't be locals.  This test
+# just helps guarantee we don't let the YYSTACK_USE_ALLOCA feature affect
+# push parsers.
+AT_DATA_STACK_TORTURE([AT_USE_ALLOCA],
+[[%define api.push_pull "both"
+]])
+AT_PARSER_CHECK([./input 20], 0, [], [ignore],
+                [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
+AT_PARSER_CHECK([./input 900], 0, [], [ignore],
+                [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
+AT_PARSER_CHECK([./input 10000], 2, [], [ignore],
+                [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
+
+m4_popdef([AT_USE_ALLOCA])

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -470,14 +518,31 @@ AT_CLEANUP
 
 AT_SETUP([Exploding the Stack Size with Malloc])
 
 
 AT_SETUP([Exploding the Stack Size with Malloc])
 

-AT_DATA_STACK_TORTURE([[#define YYSTACK_USE_ALLOCA 0]])
+m4_pushdef([AT_USE_ALLOCA], [[#define YYSTACK_USE_ALLOCA 0]])
+
+AT_DATA_STACK_TORTURE([AT_USE_ALLOCA])

 
 # Below the limit of 200.
 
 # Below the limit of 200.

-AT_PARSER_CHECK([./input 20], 0, [], [ignore])
+AT_PARSER_CHECK([./input 20], 0, [], [ignore],
+                [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])

 # Two enlargements: 2 * 2 * 200.
 # Two enlargements: 2 * 2 * 200.

-AT_PARSER_CHECK([./input 900], 0, [], [ignore])
+AT_PARSER_CHECK([./input 900], 0, [], [ignore],
+                [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])

 # Fails: beyond the limit of 10,000 (which we don't reach anyway since we
 # multiply by two starting at 200 => 5120 is the possible).
 # Fails: beyond the limit of 10,000 (which we don't reach anyway since we
 # multiply by two starting at 200 => 5120 is the possible).

-AT_PARSER_CHECK([./input 10000], 2, [], [ignore])
+AT_PARSER_CHECK([./input 10000], 2, [], [ignore],
+                [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
+
+AT_DATA_STACK_TORTURE([AT_USE_ALLOCA],
+[[%define api.push_pull "both"
+]])
+AT_PARSER_CHECK([./input 20], 0, [], [ignore],
+                [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
+AT_PARSER_CHECK([./input 900], 0, [], [ignore],
+                [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
+AT_PARSER_CHECK([./input 10000], 2, [], [ignore],
+                [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
+
+m4_popdef([AT_USE_ALLOCA])

 
 AT_CLEANUP
 
 AT_CLEANUP