X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/4c787a31df24b3bf184a4e109056a41d5712e5a7..b506d9bfcb9e96d07264a43da7bdf136329dbc86:/tests/skeletons.at

diff --git a/tests/skeletons.at b/tests/skeletons.at
index 1a9933fe..ec8170ca 100644
--- a/tests/skeletons.at
+++ b/tests/skeletons.at
@@ -83,10 +83,11 @@ AT_CLEANUP
 
 AT_SETUP([[Installed skeleton file names]])
 
+AT_BISON_OPTION_PUSHDEFS
 m4_pushdef([AT_GRAM],
 [[%{
   #include <stdio.h>
-  void yyerror (char const *msg);
+  ]AT_YYERROR_DECLARE[
   int yylex (void);
 %}
 
@@ -99,12 +100,7 @@ start: ;
 
 %%
 
-void
-yyerror (char const *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
+]AT_YYERROR_DEFINE[
 int
 yylex (void)
 {
@@ -139,6 +135,7 @@ AT_PARSER_CHECK([[./input-gram]], [[1]], [],
 
 m4_popdef([AT_GRAM])
 
+AT_BISON_OPTION_POPDEFS
 AT_CLEANUP
 
 
@@ -160,7 +157,7 @@ start: ;
 ]])
 
 AT_BISON_CHECK([[input.y]], [[1]], [[]],
-[[<skeleton default value>: invalid value for %define Boolean variable 'foo'
+[[<skeleton default value>: error: invalid value for %define Boolean variable 'foo'
 ]])
 
 AT_CLEANUP
@@ -196,8 +193,8 @@ start: ;
 AT_BISON_CHECK([[input1.y]], [[1]], [[]],
 [[input1.y: warning: foow fubar
 foow.y:2.3-5.3: warning: foowat fubar
-input1.y: fooc fubar
-fooc.y:1.1-10.5: foocat fubar
+input1.y: error: fooc fubar
+fooc.y:1.1-10.5: error: foocat fubar
 input1.y: fatal error: foof fubar
 ]])
 
@@ -267,7 +264,7 @@ start: ;
 ]])
 
 AT_BISON_CHECK([[input1.y]], [[1]], [[]],
-[[input1.y: non-fatal error
+[[input1.y: error: non-fatal error
 input1.y: fatal error: M4 should exit immediately here
 ]])