* NEWS: Version 2.0b.

[bison.git] / tests / torture.at

diff --git a/tests/torture.at b/tests/torture.at
index 4882d83e0bd0d6758b70196572457260ccb6825b..16425f6a5c3fa0876fa626e53c5205c04072ad18 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1,5 +1,5 @@
 # Torturing Bison.                                    -*- Autotest -*-
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004, 2005 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
@@ -13,20 +13,21 @@
 
 # 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 AT_BANNER([[Torture Tests.]])
 
 
 # AT_INCREASE_DATA_SIZE(SIZE)
-# -------------------------------------------
+# ---------------------------
 # Try to increase the data size to SIZE KiB if possible.
 m4_define([AT_INCREASE_DATA_SIZE],
 [data_limit=`(ulimit -S -d) 2>/dev/null`
 case $data_limit in
 [[0-9]]*)
   if test "$data_limit" -lt $1; then
+    AT_CHECK([ulimit -S -d $1 || exit 77])
     ulimit -S -d $1
   fi
 esac])
@@ -256,11 +257,11 @@ AT_CLEANUP
 
 
 
-# AT_DATA_LOOKAHEADS_GRAMMAR(FILE-NAME, SIZE)
+# AT_DATA_LOOK_AHEAD_TOKENS_GRAMMAR(FILE-NAME, SIZE)
 # -------------------------------------------
 # Create FILE-NAME, containing a self checking parser for a grammar
-# requiring SIZE lookaheads.
-m4_define([AT_DATA_LOOKAHEADS_GRAMMAR],
+# requiring SIZE look-ahead tokens.
+m4_define([AT_DATA_LOOK_AHEAD_TOKENS_GRAMMAR],
 [AT_DATA([[gengram.pl]],
 [[#! /usr/bin/perl -w
 
@@ -359,13 +360,13 @@ mv stdout $1
 ])
 
 
-## ----------------- ##
-## Many lookaheads.  ##
-## ----------------- ##
+## ------------------------ ##
+## Many look-ahead tokens.  ##
+## ------------------------ ##
 
-AT_SETUP([Many lookaheads])
+AT_SETUP([Many look-ahead tokens])
 
-AT_DATA_LOOKAHEADS_GRAMMAR([input.y], [1000])
+AT_DATA_LOOK_AHEAD_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.
@@ -387,6 +388,8 @@ m4_define([AT_DATA_STACK_TORTURE],
 # exp:
 AT_DATA([input.y],
 [[%{
+#include <errno.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 ]$1[
@@ -403,12 +406,8 @@ static void
 yyerror (const char *msg)
 {
   fprintf (stderr, "%s\n", msg);
-  exit (1);
 }
 
-/* There are YYLVAL_MAX of WAIT_FOR_EOFs. */
-unsigned int yylval_max;
-
 static int
 yylex (void)
 {
@@ -421,9 +420,14 @@ yylex (void)
 int
 main (int argc, const char **argv)
 {
+  char *endp;
   if (argc != 2)
     abort ();
-  yylval = atoi (argv[1]);
+  yylval = strtol (argv[1], &endp, 10);
+  if (! (argv[1] != endp
+        && 0 <= yylval && yylval <= INT_MAX
+        && errno != ERANGE))
+    abort ();
   yydebug = 1;
   return yyparse ();
 }
@@ -439,7 +443,11 @@ AT_COMPILE([input])
 
 AT_SETUP([Exploding the Stack Size with Alloca])
 
-AT_DATA_STACK_TORTURE
+AT_DATA_STACK_TORTURE([[
+#if defined __GNUC__ || defined alloca
+# define YYSTACK_USE_ALLOCA 1
+#endif
+]])
 
 # Below the limit of 200.
 AT_PARSER_CHECK([./input 20], 0, [], [ignore])
@@ -447,7 +455,7 @@ AT_PARSER_CHECK([./input 20], 0, [], [ignore])
 AT_PARSER_CHECK([./input 900], 0, [], [ignore])
 # 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], 1, [], [ignore])
+AT_PARSER_CHECK([./input 10000], 2, [], [ignore])
 
 AT_CLEANUP
 
@@ -468,6 +476,6 @@ AT_PARSER_CHECK([./input 20], 0, [], [ignore])
 AT_PARSER_CHECK([./input 900], 0, [], [ignore])
 # 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], 1, [], [ignore])
+AT_PARSER_CHECK([./input 10000], 2, [], [ignore])
 
 AT_CLEANUP