* README: Mention m4 1.4.3. Remove obsolete advice about

[bison.git] / tests / torture.at

diff --git a/tests/torture.at b/tests/torture.at
index 9354dfad464b6d7ca3e15386c3a2299f4f6313d0..df20a346c7abe55d969570d78dda8677741e2faf 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1,5 +1,5 @@
 # Torturing Bison.                                    -*- Autotest -*-
 # 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
 
 # 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
 
 # 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)
 
 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
 # 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])
     ulimit -S -d $1
   fi
 esac])


@@ -48,10 +49,10 @@ use strict;
 my $max = $ARGV[0] || 10;
 
 print <<EOF;
 my $max = $ARGV[0] || 10;
 
 print <<EOF;

+]AT_DATA_GRAMMAR_PROLOGUE[

 %{
 #include <stdio.h>
 #include <stdlib.h>
 %{
 #include <stdio.h>
 #include <stdlib.h>

-#include <assert.h>

 
 #define YYERROR_VERBOSE 1
 #define YYDEBUG 1
 
 #define YYERROR_VERBOSE 1
 #define YYDEBUG 1


@@ -76,8 +77,8 @@ for my $size (1 .. $max)
 print <<EOF;
 %%
 input:
 print <<EOF;
 %%
 input:

-  exp        { assert (\@S|@1 == 0); \$\$ = \@S|@1; }
-| input exp  { assert (\@S|@2 == \@S|@1 + 1); \$\$ = \@S|@2; }
+  exp        { if (\@S|@1 != 0) abort (); \$\$ = \@S|@1; }
+| input exp  { if (\@S|@2 != \@S|@1 + 1) abort (); \$\$ = \@S|@2; }

 ;
 
 exp:
 ;
 
 exp:


@@ -144,7 +145,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 input.y -v -o input.c])
+AT_CHECK([bison -v -o input.c input.y])

 AT_COMPILE([input])
 AT_PARSER_CHECK([./input])
 
 AT_COMPILE([input])
 AT_PARSER_CHECK([./input])
 


@@ -164,10 +165,10 @@ use strict;
 my $max = $ARGV[0] || 10;
 
 print <<EOF;
 my $max = $ARGV[0] || 10;
 
 print <<EOF;

+]AT_DATA_GRAMMAR_PROLOGUE[

 %{
 #include <stdio.h>
 #include <stdlib.h>
 %{
 #include <stdio.h>
 #include <stdlib.h>

-#include <assert.h>

 
 #define YYERROR_VERBOSE 1
 #define YYDEBUG 1
 
 #define YYERROR_VERBOSE 1
 #define YYDEBUG 1


@@ -248,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 input.y -v -o input.c])
+AT_CHECK([bison -v -o input.c input.y])

 AT_COMPILE([input])
 AT_PARSER_CHECK([./input])
 
 AT_COMPILE([input])
 AT_PARSER_CHECK([./input])
 


@@ -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
 # -------------------------------------------
 # 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
 
 [AT_DATA([[gengram.pl]],
 [[#! /usr/bin/perl -w
 


@@ -272,7 +273,6 @@ print <<EOF;
 %{
 #include <stdio.h>
 #include <stdlib.h>
 %{
 #include <stdio.h>
 #include <stdlib.h>

-#include <assert.h>

 
 #define YYERROR_VERBOSE 1
 #define YYDEBUG 1
 
 #define YYERROR_VERBOSE 1
 #define YYDEBUG 1


@@ -303,17 +303,17 @@ for my $count (1 .. $max)
 print <<EOF;
 %%
 input:
 print <<EOF;
 %%
 input:

-  exp        { assert (\@S|@1 == 1); \$\$ = \@S|@1; }
-| input exp  { assert (\@S|@2 == \@S|@1 + 1); \$\$ = \@S|@2; }
+  exp        { if (\@S|@1 != 1) abort (); \$\$ = \@S|@1; }
+| input exp  { if (\@S|@2 != \@S|@1 + 1) abort (); \$\$ = \@S|@2; }

 ;
 
 exp:
 ;
 
 exp:

-  n1 "1" { assert (\@S|@1 == 1); }
+  n1 "1" { if (\@S|@1 != 1) abort (); }

 EOF
 
 for my $count (2 .. $max)
   {
 EOF
 
 for my $count (2 .. $max)
   {

-    print "| n$count \"$count\" { assert (\@S|@1 == $count); }\n";
+    print "| n$count \"$count\" { if (\@S|@1 != $count) abort (); }\n";

   };
 print ";\n";
 
   };
 print ";\n";
 


@@ -360,19 +360,19 @@ 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.
 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 input.y -v -o input.c])
+AT_CHECK([bison -v -o input.c input.y])

 AT_COMPILE([input])
 AT_PARSER_CHECK([./input])
 
 AT_COMPILE([input])
 AT_PARSER_CHECK([./input])
 


@@ -390,7 +390,6 @@ AT_DATA([input.y],
 [[%{
 #include <stdio.h>
 #include <stdlib.h>
 [[%{
 #include <stdio.h>
 #include <stdlib.h>

-#include <assert.h>

 ]$1[
   static int yylex (void);
   static void yyerror (const char *msg);
 ]$1[
   static int yylex (void);
   static void yyerror (const char *msg);


@@ -423,13 +422,14 @@ yylex (void)
 int
 main (int argc, const char **argv)
 {
 int
 main (int argc, const char **argv)
 {

-  assert (argc == 2);
+  if (argc != 2)
+    abort ();

   yylval = atoi (argv[1]);
   yydebug = 1;
   return yyparse ();
 }
 ]])
   yylval = atoi (argv[1]);
   yydebug = 1;
   return yyparse ();
 }
 ]])

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

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


@@ -440,7 +440,11 @@ AT_COMPILE([input])
 
 AT_SETUP([Exploding the Stack Size with Alloca])
 
 
 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])
 
 # Below the limit of 200.
 AT_PARSER_CHECK([./input 20], 0, [], [ignore])