* tests/calc.at: Catch up with 1.30.

[bison.git] / tests / calc.at

diff --git a/tests/calc.at b/tests/calc.at
index ba5293f53e5676958c8c08407b67eb2eee6484bf..f1064634cfa2a57fa937ac781530082300f246c6 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -256,8 +256,8 @@ main (int argc, const char **argv)
 # Produce `calc.y'.
 m4_define([AT_DATA_CALC_Y],
 [_AT_DATA_CALC_Y($[1], $[2], $[3],
-                 [m4_match([$1], [--yyerror-verbose],
-                           [[#define YYERROR_VERBOSE 1]])])])
+                 [m4_bmatch([$1], [--yyerror-verbose],
+                            [[#define YYERROR_VERBOSE]])])])
 
 
 
@@ -338,7 +338,7 @@ AT_CHECK([bison calc.y -o calc.c m4_bpatsubst([$1], [--yyerror-verbose])],
 # warnings, but this place is not the right one for that.
 # So let's keep only GCC warnings, which we know are sane.
 AT_CHECK([$CC $CFLAGS $CPPFLAGS calc.c -o calc], 0, [], [stderr])
-AT_CHECK([test "$GCC" = yes && cat stderr])
+AT_CHECK([if test "$GCC" = yes; then cat stderr; else true; fi])
 
 # Test the priorities.
 _AT_CHECK_CALC([$1],