X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/5a08f1ce215ab931d571cd9331309c2785bc8551..427c0dda0c9fb207d8abdd92e3f77f91af9b682d:/tests/calc.at

diff --git a/tests/calc.at b/tests/calc.at
index 5f91557c..8875f9cd 100644
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -290,7 +290,7 @@ m4_define([_AT_CHECK_CALC],
 [AT_DATA([[input]],
 [[$2
 ]])
-AT_CHECK([./calc input], 0, [], [stderr])dnl
+AT_PARSER_CHECK([./calc input], 0, [], [stderr])dnl
 AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
          [m4_bmatch([$1], [--debug],
                     [$3], [0])
@@ -317,11 +317,11 @@ AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
 # of expected lines on stderr.
 m4_define([_AT_CHECK_CALC_ERROR],
 [m4_bmatch([$2], [^/],
-           [AT_CHECK([./calc $2], 0, [], [stderr])],
+           [AT_PARSER_CHECK([./calc $2], 0, [], [stderr])],
            [AT_DATA([[input]],
 [[$2
 ]])
-AT_CHECK([./calc input], 0, [], [stderr])])
+AT_PARSER_CHECK([./calc input], 0, [], [stderr])])
 
 m4_bmatch([$1], [--debug],
 [AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0, [$3
@@ -372,7 +372,7 @@ AT_DATA_CALC_Y([$1])
 AT_CHECK([bison calc.y -o calc.c m4_bpatsubst([$1], [--yyerror-verbose])],
          [0], [], [])
 
-AT_CHECK([$CC $CFLAGS $CPPFLAGS calc.c -o calc], 0, [], [ignore])
+AT_COMPILE([calc])
 
 # Test the priorities.
 _AT_CHECK_CALC([$1],
@@ -396,7 +396,7 @@ _AT_CHECK_CALC_ERROR([$1], [0 0], [11],
 _AT_CHECK_CALC_ERROR([$1], [1//2], [15],
                      [1.3-1.4: parse error, unexpected '/', expecting "number" or '-' or '('])
 _AT_CHECK_CALC_ERROR([$1], [error], [4],
-                     [1.1-1.2: parse error, unexpected $undefined., expecting "number" or '-' or '\n' or '('])
+                     [1.1-1.2: parse error, unexpected $undefined, expecting "number" or '-' or '\n' or '('])
 _AT_CHECK_CALC_ERROR([$1], [1 = 2 = 3], [22],
                      [1.7-1.8: parse error, unexpected '='])
 _AT_CHECK_CALC_ERROR([$1],
@@ -419,7 +419,7 @@ calc: error: 0 != 1])
 # Add a studid example demonstrating that Bison can further improve the
 # error message.  FIXME: Fix this ridiculous message.
 _AT_CHECK_CALC_ERROR([$1], [()], [21],
-[1.2-1.3: parse error, unexpected ')', expecting error or "number" or '-' or '('])
+[1.2-1.3: parse error, unexpected ')', expecting "number" or '-' or '('])
 
 AT_CLEANUP
 ])# AT_CHECK_CALC