X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/7dc4a6940c964d3650fecc6a0c99d8e191517086..798096e1deaeb13a06e62de5c73487537e220e3c:/tests/skeletons.at

diff --git a/tests/skeletons.at b/tests/skeletons.at
index 53c3049b..3845d3dd 100644
--- a/tests/skeletons.at
+++ b/tests/skeletons.at
@@ -58,17 +58,17 @@ AT_DATA([[tmp/input-cmd-line.y]],
 start: ;
 ]])
 
-AT_CHECK([[bison tmp/input-gram.y]])
+AT_BISON_CHECK([[tmp/input-gram.y]])
 AT_CHECK([[cat input-gram.tab.c]], [[0]],
 [[Hello World
 ]])
 
-AT_CHECK([[bison input-gram.y]])
+AT_BISON_CHECK([[input-gram.y]])
 AT_CHECK([[cat input-gram.tab.c]], [[0]],
 [[Hello World -- Local
 ]])
 
-AT_CHECK([[bison --skeleton=tmp/skel.c tmp/input-cmd-line.y]])
+AT_BISON_CHECK([[--skeleton=tmp/skel.c tmp/input-cmd-line.y]])
 AT_CHECK([[cat input-cmd-line.tab.c]], [[0]],
 [[Hello World
 ]])
@@ -124,13 +124,13 @@ AT_DATA([[input-gram.y]],
 [[%skeleton "yacc.c"]
 AT_GRAM])
 
-AT_CHECK([[bison --skeleton=yacc.c -o input-cmd-line.c input-cmd-line.y]])
+AT_BISON_CHECK([[--skeleton=yacc.c -o input-cmd-line.c input-cmd-line.y]])
 AT_COMPILE([[input-cmd-line]])
 AT_PARSER_CHECK([[./input-cmd-line]], [[1]], [],
 [[syntax error, unexpected 'a', expecting $end
 ]])
 
-AT_CHECK([[bison -o input-gram.c input-gram.y]])
+AT_BISON_CHECK([[-o input-gram.c input-gram.y]])
 AT_COMPILE([[input-gram]])
 AT_PARSER_CHECK([[./input-gram]], [[1]], [],
 [[syntax error, unexpected 'a', expecting $end
@@ -158,8 +158,8 @@ AT_DATA([[input.y]],
 start: ;
 ]])
 
-AT_CHECK([[bison input.y]], [[1]], [[]],
-[[[Bison:b4_percent_define_default]:0.0: invalid value for %define Boolean variable `foo'
+AT_BISON_CHECK([[input.y]], [[1]], [[]],
+[[[Bison:b4_percent_define_default]:1.0: invalid value for %define Boolean variable `foo'
 ]])
 
 AT_CLEANUP
@@ -192,7 +192,7 @@ AT_DATA([[input1.y]],
 start: ;
 ]])
 
-AT_CHECK([[bison input1.y]], [[1]], [[]],
+AT_BISON_CHECK([[input1.y]], [[1]], [[]],
 [[input1.y: warning: foow fubar
 foow.y:2.3-5.3: warning: foowat fubar
 input1.y: fooc fubar
@@ -212,10 +212,38 @@ AT_DATA([[input2.y]],
 start: ;
 ]])
 
-AT_CHECK([[bison input2.y]], [[1]], [[]],
+AT_BISON_CHECK([[input2.y]], [[1]], [[]],
 [[foof.y:12.11-100.122: fatal error: foofat fubar
 ]])
 
+AT_DATA([[skel3.c]],
+[[b4_complain_at(b4_percent_define_get_loc([[bogus]]), [[bad value]])
+]])
+
+AT_DATA([[input3.y]],
+[[%skeleton "./skel3.c"
+%%
+start: ;
+]])
+
+AT_BISON_CHECK([[input3.y]], [[1]], [[]],
+[[input3.y: fatal error: undefined %define variable `bogus' passed to b4_percent_define_get_loc
+]])
+
+AT_DATA([[skel4.c]],
+[[b4_warn_at(b4_percent_define_get_syncline([[bogus]]), [[bad value]])
+]])
+
+AT_DATA([[input4.y]],
+[[%skeleton "./skel4.c"
+%%
+start: ;
+]])
+
+AT_BISON_CHECK([[input4.y]], [[1]], [[]],
+[[input4.y: fatal error: undefined %define variable `bogus' passed to b4_percent_define_get_syncline
+]])
+
 AT_CLEANUP
 
 
@@ -237,7 +265,7 @@ AT_DATA([[input1.y]],
 start: ;
 ]])
 
-AT_CHECK([[bison input1.y]], [[1]], [[]],
+AT_BISON_CHECK([[input1.y]], [[1]], [[]],
 [[input1.y: non-fatal error
 input1.y: fatal error: M4 should exit immediately here
 ]])
@@ -254,7 +282,7 @@ AT_DATA([[input2.y]],
 start: ;
 ]])
 
-AT_CHECK([[bison input2.y]], [[1]], [[]],
+AT_BISON_CHECK([[input2.y]], [[1]], [[]],
 [[input2.y: warning: morning
 foo.y:1.5-6: fatal error: M4 should exit immediately here
 ]])