X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/35b8730d018b0bb25f7864d0db20f687ebad11b6..c843aaab352ab1f40c7d218fb5bb2c6fd6fd3a88:/tests/skeletons.at

diff --git a/tests/skeletons.at b/tests/skeletons.at
index ca0cbb84..60fc1176 100644
--- a/tests/skeletons.at
+++ b/tests/skeletons.at
@@ -1,5 +1,5 @@
 # Checking skeleton support.                     -*- Autotest -*-
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -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]:1.0: invalid value for %define Boolean variable `foo'
+AT_BISON_CHECK([[input.y]], [[1]], [[]],
+[[<skeleton default value>: 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,7 +212,7 @@ 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
 ]])
 
@@ -226,7 +226,7 @@ AT_DATA([[input3.y]],
 start: ;
 ]])
 
-AT_CHECK([[bison input3.y]], [[1]], [[]],
+AT_BISON_CHECK([[input3.y]], [[1]], [[]],
 [[input3.y: fatal error: undefined %define variable `bogus' passed to b4_percent_define_get_loc
 ]])
 
@@ -240,7 +240,7 @@ AT_DATA([[input4.y]],
 start: ;
 ]])
 
-AT_CHECK([[bison input4.y]], [[1]], [[]],
+AT_BISON_CHECK([[input4.y]], [[1]], [[]],
 [[input4.y: fatal error: undefined %define variable `bogus' passed to b4_percent_define_get_syncline
 ]])
 
@@ -265,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
 ]])
@@ -282,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
 ]])