tests: use valgrind where appropriate

Reported by Théophile Ranquet.

* tests/glr-regression.at: Rewrite some test cases so that AT_PARSER_CHECK,
which runs valgrind, is exposed with the parser, not with "echo".
* tests/local.at, tests/regression.at, tests/headers.at:
Use AT_PARSER_CHECK for generated parsers.

diff --git a/THANKS b/THANKS
index 4e88e8f365d403480f35ed3d33f8cd1ec261ad0b..e815f8ed20c507d10b1a9f925261b45ed42d891e 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -106,6 +106,7 @@ Shura                     debil_urod@ngs.ru
 Stefano Lattarini         stefano.lattarini@gmail.com
 Steve Murphy              murf@parsetree.com
 Sum Wu                    sum@geekhouse.org
 Stefano Lattarini         stefano.lattarini@gmail.com
 Steve Murphy              murf@parsetree.com
 Sum Wu                    sum@geekhouse.org

+Théophile Ranquet         theophile.ranquet@gmail.com

 Thiru Ramakrishnan        thiru.ramakrishnan@gmail.com
 Tim Josling               tej@melbpc.org.au
 Tim Landscheidt           tim@tim-landscheidt.de
 Thiru Ramakrishnan        thiru.ramakrishnan@gmail.com
 Tim Josling               tej@melbpc.org.au
 Tim Landscheidt           tim@tim-landscheidt.de

diff --git a/tests/glr-regression.at b/tests/glr-regression.at
index 8570b19d77082c9a3da9b276157a6ff6f9da9535..aab0369ffaf847da0a24b706d94c7471b9949307 100644 (file)
--- a/tests/glr-regression.at
+++ b/tests/glr-regression.at
@@ -67,9 +67,13 @@ static YYSTYPE exprMerge (YYSTYPE x0, YYSTYPE x1)
   return 0;
 }
 
   return 0;
 }
 

+const char *input = NULL;
+

 int
 int

-main (void)
+main (int argc, const char* argv[])

 {
 {

+  assert (argc == 2);
+  input = argv[1];

   return yyparse ();
 }
 
   return yyparse ();
 }
 


@@ -78,16 +82,7 @@ main (void)
 int
 yylex (void)
 {
 int
 yylex (void)
 {

-  for (;;)
-    {
-      int ch;
-      assert (!feof (stdin));
-      ch = getchar ();
-      if (ch == EOF)
-       return 0;
-      else if (ch == 'B' || ch == 'P')
-       return ch;
-    }
+  return *input++;

 }
 ]])
 AT_BISON_OPTION_POPDEFS
 }
 ]])
 AT_BISON_OPTION_POPDEFS


@@ -96,7 +91,7 @@ AT_BISON_CHECK([[-o glr-regr1.c glr-regr1.y]], 0, [],
 [glr-regr1.y: conflicts: 1 shift/reduce
 ])
 AT_COMPILE([glr-regr1])
 [glr-regr1.y: conflicts: 1 shift/reduce
 ])
 AT_COMPILE([glr-regr1])

-AT_PARSER_CHECK([[echo BPBPB | ./glr-regr1]], 0,
+AT_PARSER_CHECK([[./glr-regr1 BPBPB]], 0,

 [[E -> 'B'
 E -> 'B'
 E -> E 'P' E
 [[E -> 'B'
 E -> 'B'
 E -> E 'P' E


@@ -212,16 +207,27 @@ AT_BISON_CHECK([[-o glr-regr2a.c glr-regr2a.y]], 0, [],
 ])
 AT_COMPILE([glr-regr2a])
 
 ])
 AT_COMPILE([glr-regr2a])
 

-AT_PARSER_CHECK([[echo s VARIABLE_1 t v x q | ./glr-regr2a]], 0,
+AT_DATA([input1.txt],
+[[s VARIABLE_1 t v x q
+]])
+AT_PARSER_CHECK([[./glr-regr2a input1.txt]], 0,

 [[Variable: 'VARIABLE_1'
 [[Variable: 'VARIABLE_1'

-]], [])
-AT_PARSER_CHECK([[echo s VARIABLE_1 , ANOTHER_VARIABLE_2 t e | ./glr-regr2a]],
+]])
+
+AT_DATA([input2.txt],
+[[s VARIABLE_1 , ANOTHER_VARIABLE_2 t e
+]])
+AT_PARSER_CHECK([[./glr-regr2a input2.txt]],

 0,
 [[Varlist: 'VARIABLE_1,ANOTHER_VARIABLE_2'
 ]])
 0,
 [[Varlist: 'VARIABLE_1,ANOTHER_VARIABLE_2'
 ]])

-AT_PARSER_CHECK([[echo s VARIABLE_3 t v x | ./glr-regr2a]], 0,
+
+AT_DATA([input3.txt],
+[[s VARIABLE_3 t v x
+]])
+AT_PARSER_CHECK([[./glr-regr2a input3.txt]], 0,

 [[Variable: 'VARIABLE_3'
 [[Variable: 'VARIABLE_3'

-]], [])
+]])

 
 
 AT_CLEANUP
 
 
 AT_CLEANUP


@@ -329,10 +335,13 @@ AT_BISON_CHECK([[-o glr-regr3.c glr-regr3.y]], 0, [],
 ])
 AT_COMPILE([glr-regr3])
 
 ])
 AT_COMPILE([glr-regr3])
 

-AT_PARSER_CHECK([[echo p1 t4 o2 p1 p1 t1 o1 t2 p2 o1 t3 p2 p2 | ./glr-regr3]],
+AT_DATA([input.txt],
+[[p1 t4 o2 p1 p1 t1 o1 t2 p2 o1 t3 p2 p2
+]])
+AT_PARSER_CHECK([[./glr-regr3 input.txt]],

 0,
 [[Result: 1c04
 0,
 [[Result: 1c04

-]], [])
+]])

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 

diff --git a/tests/headers.at b/tests/headers.at
index 7df4cc9de7f2598cc2fd47014e293a0ff141474d..b53ee8a02b56149dfba941542a4ba4bfbf785c1c 100644 (file)
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -272,7 +272,7 @@ done
 AT_SKIP_IF_CANNOT_LINK_C_AND_CXX
 
 AT_COMPILE_CXX([parser], [[x[1-8].o -DCC_IS_CXX=$CC_IS_CXX main.cc]])
 AT_SKIP_IF_CANNOT_LINK_C_AND_CXX
 
 AT_COMPILE_CXX([parser], [[x[1-8].o -DCC_IS_CXX=$CC_IS_CXX main.cc]])

-AT_CHECK([./parser], [0], [[expout]])
+AT_PARSER_CHECK([./parser], [0], [[expout]])

 
 m4_popdef([AT_TEST])
 
 
 m4_popdef([AT_TEST])
 

diff --git a/tests/local.at b/tests/local.at
index e803e57ffc1491b68aa804b3567b4c57b4f2db8b..a5dde80a9ad75c89b6c89d91edb2c9f9bb48f38d 100644 (file)
--- a/tests/local.at
+++ b/tests/local.at
@@ -716,7 +716,7 @@ AT_COMPILE([c-only.o], [c-only.c])
 AT_COMPILE_CXX([cxx-only.o], [cxx-only.cc])
 AT_CHECK([$CXX $CXXFLAGS $CPPFLAGS $LDFLAGS c-only.o cxx-only.o -o c-and-cxx ||
           exit 77], [ignore], [ignore])
 AT_COMPILE_CXX([cxx-only.o], [cxx-only.cc])
 AT_CHECK([$CXX $CXXFLAGS $CPPFLAGS $LDFLAGS c-only.o cxx-only.o -o c-and-cxx ||
           exit 77], [ignore], [ignore])

-AT_CHECK([./c-and-cxx])
+AT_PARSER_CHECK([./c-and-cxx])

 ])
 
 
 ])
 
 

diff --git a/tests/regression.at b/tests/regression.at
index 6cf226859bdf6610e78e1420ffd3812ad3bdab1b..03c4b80881808cac7794e8cd42201bfad5cd6b28 100644 (file)
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -1593,7 +1593,7 @@ main (void)
 ]])
 
 AT_FULL_COMPILE([input])
 ]])
 
 AT_FULL_COMPILE([input])

-AT_CHECK([./input], 0, [[x: 1, y: 2
+AT_PARSER_CHECK([./input], 0, [[x: 1, y: 2

 ]])
 AT_BISON_OPTION_POPDEFS
 
 ]])
 AT_BISON_OPTION_POPDEFS