X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/279cabb657e5116d9fd4badace040f36f579199a..da730230ce159265f4380daa456e3e3c5f9422f4:/tests/output.at

diff --git a/tests/output.at b/tests/output.at
index 06f30c79..28ed0526 100644
--- a/tests/output.at
+++ b/tests/output.at
@@ -2,20 +2,18 @@
 # Copyright (C) 2000, 2001, 2002, 2005, 2006, 2007 Free Software Foundation,
 # Inc.
 
-# This program is free software; you can redistribute it and/or modify
+# 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AT_BANNER([[Output file names.]])
 
@@ -34,7 +32,7 @@ AT_DATA([$1],
 foo: {};
 ]])
 
-AT_CHECK([bison $3 $1 $5], 0)
+AT_BISON_CHECK([$3 $1 $5], 0)
 AT_CHECK([ls $4], [], [ignore])
 $6
 AT_CLEANUP
@@ -132,7 +130,7 @@ AT_DATA([$1],
 foo: {};
 ]])
 
-AT_CHECK([bison $3 $1], 0, [], [$4])
+AT_BISON_CHECK([$3 $1], 0, [], [$4])
 AT_CLEANUP
 ])
 
@@ -157,7 +155,7 @@ AT_CHECK_CONFLICTING_OUTPUT([foo.y],
 m4_define([AT_CHECK_OUTPUT_FILE_NAME],
 [AT_SETUP([Output file name: $1])
 
-AT_DATA([glr.y],
+AT_DATA_GRAMMAR([glr.y],
 [[%glr-parser
 %code {
   int yylex (void);
@@ -166,18 +164,18 @@ AT_DATA([glr.y],
 %%
 start: {};
 ]])
-AT_CHECK([bison -o "AS_ESCAPE([$1.c])" --defines="AS_ESCAPE([$1.h])" glr.y])
+AT_BISON_CHECK([-o "AS_ESCAPE([$1.c])" --defines="AS_ESCAPE([$1.h])" glr.y])
 AT_CHECK([ls "AS_ESCAPE([$1.c])" "AS_ESCAPE([$1.h])"], [], [ignore])
 AT_COMPILE([glr.o], [-c "AS_ESCAPE([$1.c])"])
 $2
 
-AT_DATA([cxx.y],
+AT_DATA_GRAMMAR([cxx.y],
 [[%skeleton "lalr1.cc"
 %code { int yylex (yy::parser::semantic_type*); }
 %%
 start: {};
 ]])
-AT_CHECK([bison -o "AS_ESCAPE([$1.c])" --defines="AS_ESCAPE([$1.h])" cxx.y])
+AT_BISON_CHECK([-o "AS_ESCAPE([$1.c])" --defines="AS_ESCAPE([$1.h])" cxx.y])
 AT_CHECK([ls "AS_ESCAPE([$1.c])" "AS_ESCAPE([$1.h])"], [], [ignore])
 AT_COMPILE_CXX([cxx.o], [-c "AS_ESCAPE([$1.c])"])
 $2