X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/39ceb25bdbe9fe2a0963f55430a8dd44e82c3161..f7737e2e16cb9a49c258ac4b82b2b5f4fa9d0f18:/tests/torture.at?ds=sidebyside

diff --git a/tests/torture.at b/tests/torture.at
index 2e0cfc92..b9032d0c 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -19,6 +19,19 @@
 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.  ##
 ## ------------------------------------- ##
@@ -57,7 +70,7 @@ EOF
 
 for my $size (1 .. $max)
   {
-    print "%token \"$size\" ", $size, "\n";
+    print "%token t$size $size \"$size\"\n";
   };
 
 print <<EOF;
@@ -128,10 +141,12 @@ AT_SETUP([Big triangle])
 
 # I have been able to go up to 2000 on my machine.
 # I tried 3000, a 29Mb grammar file, but then my system killed bison.
-AT_DATA_TRIANGULAR_GRAMMAR([input.y], [500])
-AT_CHECK([bison input.y -v -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore])
-AT_CHECK([./input])
+# 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_COMPILE([input])
+AT_PARSER_CHECK([./input])
 
 AT_CLEANUP
 
@@ -164,7 +179,7 @@ EOF
 
 for my $size (1 .. $max)
   {
-    print "%token \"$size\" ", $size, "\n";
+    print "%token t$size $size \"$size\"\n";
   };
 
 print <<EOF;
@@ -228,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])
-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
 
@@ -272,12 +292,12 @@ EOF
 print
   wrap ("%type <val> ",
 	"            ",
-	map { "token$_" } (1 .. $max)),
+	map { "n$_" } (1 .. $max)),
   "\n";
 
 for my $count (1 .. $max)
   {
-    print "%token \"$count\" $count\n";
+    print "%token t$count $count \"$count\"\n";
   };
 
 print <<EOF;
@@ -288,18 +308,18 @@ input:
 ;
 
 exp:
-  token1 "1" { assert (\@S|@1 == 1); }
+  n1 "1" { assert (\@S|@1 == 1); }
 EOF
 
 for my $count (2 .. $max)
   {
-    print "| token$count \"$count\" { assert (\@S|@1 == $count); }\n";
+    print "| n$count \"$count\" { assert (\@S|@1 == $count); }\n";
   };
 print ";\n";
 
 for my $count (1 .. $max)
   {
-    print "token$count: token { \$\$ = $count; };\n";
+    print "n$count: token { \$\$ = $count; };\n";
   };
 
 print <<EOF;
@@ -347,9 +367,14 @@ mv stdout $1
 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
 
@@ -369,9 +394,6 @@ AT_DATA([input.y],
 ]$1[
   static int yylex (void);
   static void yyerror (const char *msg);
-#define YYPRINT(File, Type, Value)                   \
-  fprintf (File, " (%d, stack size = %d, max = %d)", \
-           Value, yyssp - yyss + 1, yystacksize);
 %}
 %error-verbose
 %debug
@@ -407,8 +429,8 @@ main (int argc, const char **argv)
   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])
 ])
 
 
@@ -421,12 +443,12 @@ AT_SETUP([Exploding the Stack Size with Alloca])
 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.
-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).
-AT_CHECK([./input 10000], 1, [], [ignore])
+AT_PARSER_CHECK([./input 10000], 1, [], [ignore])
 
 AT_CLEANUP
 
@@ -442,11 +464,11 @@ AT_SETUP([Exploding the Stack Size with Malloc])
 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.
-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).
-AT_CHECK([./input 10000], 1, [], [ignore])
+AT_PARSER_CHECK([./input 10000], 1, [], [ignore])
 
 AT_CLEANUP