* tests/atlocal.in (CPPFLAGS): We have config.h.

[bison.git] / tests / headers.at

diff --git a/tests/headers.at b/tests/headers.at
index 3f8ea961796a8939ab38057cc22a48b0300695ea..81d5c7dc90d6e76f178445f00e1f3bf71b7c4725 100644 (file)
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -55,9 +55,9 @@ m4_define([AT_TEST_CPP_GUARD_H],
 dirname=`AS_DIRNAME([$1])`
 AS_MKDIR_P([$dirname])
 
-AT_DATA([$1.y],
+AT_DATA_GRAMMAR([$1.y],
 [%%
-dummy:
+dummy:;
 ])
 
 AT_CHECK([bison --defines=$1.h $1.y])
@@ -80,7 +80,7 @@ AT_TEST_CPP_GUARD_H([9foo])
 
 AT_SETUP([export YYLTYPE])
 
-AT_DATA([input.y],
+AT_DATA_GRAMMAR([input.y],
 [%locations
 
 %name-prefix="my_"
@@ -105,7 +105,7 @@ my_error (const char *msg)
 exp:;
 ])
 
-AT_CHECK([bison --defines input.y -o input.c])
+AT_CHECK([bison --defines -o input.c input.y])
 
 # YYLTYPE should be defined, and MY_LLOC declared.
 AT_DATA([caller.c],
@@ -123,7 +123,9 @@ main (void)
 
 # 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