benchmarks: use %debug consistently among grammars.

[bison.git] / tests / headers.at

diff --git a/tests/headers.at b/tests/headers.at
index 122e58460f63a3815292ef3a4ccaebda3c2f4931..66a606c7507171a8ed332fba01ff50d45d1f226f 100644 (file)
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -1,20 +1,19 @@
 # Bison Parser Headers.                               -*- Autotest -*-
 # Bison Parser Headers.                               -*- Autotest -*-

-# Copyright 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2006, 2007, 2009 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
 # 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.
 # 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
 # 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 
 AT_BANNER([[Parser Headers.]])
 
 
 AT_BANNER([[Parser Headers.]])
 


@@ -36,7 +35,7 @@ AT_DATA([input.y],
 exp: {};
 ])
 
 exp: {};
 ])
 

-AT_CHECK([bison --defines input.y])
+AT_BISON_CHECK([--defines input.y])

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -55,15 +54,21 @@ m4_define([AT_TEST_CPP_GUARD_H],
 dirname=`AS_DIRNAME([$1])`
 AS_MKDIR_P([$dirname])
 
 dirname=`AS_DIRNAME([$1])`
 AS_MKDIR_P([$dirname])
 

-AT_DATA([$1.y],
-[%%
+AT_DATA_GRAMMAR([$1.y],
+[%{
+#include <$1.h>
+void yyerror (const char *);
+int yylex (void);
+%}
+%%

 dummy:;
 dummy:;

+%%
+#include <$1.h>

 ])
 
 ])
 

-AT_CHECK([bison --defines=$1.h $1.y])
+AT_BISON_CHECK([--defines=$1.h --output=y.tab.c $1.y])

 
 

-# CPP should be happy with it.
-AT_CHECK([$CC -E $1.h], 0, [ignore])
+AT_COMPILE([y.tab.o], [-I. -c y.tab.c])

 
 AT_CLEANUP
 ])
 
 AT_CLEANUP
 ])


@@ -80,10 +85,10 @@ AT_TEST_CPP_GUARD_H([9foo])
 
 AT_SETUP([export YYLTYPE])
 
 
 AT_SETUP([export YYLTYPE])
 

-AT_DATA([input.y],
+AT_DATA_GRAMMAR([input.y],

 [%locations
 
 [%locations
 

-%name-prefix="my_"
+%name-prefix "my_"

 %{
 #include <stdio.h>
 #include <stdlib.h>
 %{
 #include <stdio.h>
 #include <stdlib.h>


@@ -105,7 +110,7 @@ my_error (const char *msg)
 exp:;
 ])
 
 exp:;
 ])
 

-AT_CHECK([bison --defines input.y -o input.c])
+AT_BISON_CHECK([--defines -o input.c input.y])

 
 # YYLTYPE should be defined, and MY_LLOC declared.
 AT_DATA([caller.c],
 
 # YYLTYPE should be defined, and MY_LLOC declared.
 AT_DATA([caller.c],


@@ -123,7 +128,9 @@ main (void)
 
 # Link and execute, just to make sure everything is fine (and in
 # particular, that MY_LLOC is indeed defined somewhere).
 
 # Link and execute, just to make sure everything is fine (and in
 # particular, that MY_LLOC is indeed defined somewhere).

-AT_CHECK([$CC $CFLAGS $CPPFLAGS caller.c input.c -o caller], 0, [], [ignore])
-AT_CHECK([./caller])
+AT_COMPILE([caller.o], [-c caller.c])
+AT_COMPILE([input.o], [-c input.c])
+AT_COMPILE([caller], [caller.o input.o])
+AT_PARSER_CHECK([./caller])

 
 AT_CLEANUP
 
 AT_CLEANUP