Minor improvements to today's scan-gram.l bugfix.

[bison.git] / tests / torture.at

diff --git a/tests/torture.at b/tests/torture.at
index 747201c68cc38333e58cb56659793e936acb2cdf..4882d83e0bd0d6758b70196572457260ccb6825b 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -19,6 +19,19 @@
 AT_BANNER([[Torture Tests.]])
 
 
 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
+    ulimit -S -d $1
+  fi
+esac])
+
+

 ## ------------------------------------- ##
 ## Creating a large artificial grammar.  ##
 ## ------------------------------------- ##
 ## ------------------------------------- ##
 ## Creating a large artificial grammar.  ##
 ## ------------------------------------- ##


@@ -35,10 +48,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


@@ -63,8 +76,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:


@@ -131,9 +144,9 @@ 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([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore])
-AT_CHECK([./input])
+AT_CHECK([bison -v -o input.c input.y])
+AT_COMPILE([input])
+AT_PARSER_CHECK([./input])

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -151,10 +164,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


@@ -230,9 +243,14 @@ AT_SETUP([Big horizontal])
 # ./input                          0.00s user 0.01s sys 108% cpu     0.01 total
 #
 AT_DATA_HORIZONTAL_GRAMMAR([input.y], [1000])
 # ./input                          0.00s user 0.01s sys 108% cpu     0.01 total
 #
 AT_DATA_HORIZONTAL_GRAMMAR([input.y], [1000])

-AT_CHECK([bison input.y -v -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore])
-AT_CHECK([./input])
+
+# 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_COMPILE([input])
+AT_PARSER_CHECK([./input])

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -254,7 +272,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


@@ -285,17 +302,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";
 


@@ -349,9 +366,14 @@ mv stdout $1
 AT_SETUP([Many lookaheads])
 
 AT_DATA_LOOKAHEADS_GRAMMAR([input.y], [1000])
 AT_SETUP([Many lookaheads])
 
 AT_DATA_LOOKAHEADS_GRAMMAR([input.y], [1000])

-AT_CHECK([bison input.y -v -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore])
-AT_CHECK([./input])
+
+# 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_COMPILE([input])
+AT_PARSER_CHECK([./input])

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -367,7 +389,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);


@@ -400,14 +421,15 @@ 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([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore])
+AT_CHECK([bison -o input.c input.y])
+AT_COMPILE([input])

 ])
 
 
 ])
 
 


@@ -420,12 +442,12 @@ AT_SETUP([Exploding the Stack Size with Alloca])
 AT_DATA_STACK_TORTURE
 
 # Below the limit of 200.
 AT_DATA_STACK_TORTURE
 
 # Below the limit of 200.

-AT_CHECK([./input 20], 0, [], [ignore])
+AT_PARSER_CHECK([./input 20], 0, [], [ignore])

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

-AT_CHECK([./input 900], 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).
 # 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_CHECK([./input 10000], 1, [], [ignore])
+AT_PARSER_CHECK([./input 10000], 1, [], [ignore])

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -441,11 +463,11 @@ AT_SETUP([Exploding the Stack Size with Malloc])
 AT_DATA_STACK_TORTURE([[#define YYSTACK_USE_ALLOCA 0]])
 
 # Below the limit of 200.
 AT_DATA_STACK_TORTURE([[#define YYSTACK_USE_ALLOCA 0]])
 
 # Below the limit of 200.

-AT_CHECK([./input 20], 0, [], [ignore])
+AT_PARSER_CHECK([./input 20], 0, [], [ignore])

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

-AT_CHECK([./input 900], 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).
 # 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_CHECK([./input 10000], 1, [], [ignore])
+AT_PARSER_CHECK([./input 10000], 1, [], [ignore])

 
 AT_CLEANUP
 
 AT_CLEANUP