X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/1154ccedaf2f504455446e484932c5c9ffd2a18e..04877eec24484987b78387708e0a247b558b23cb:/tests/headers.at?ds=sidebyside

diff --git a/tests/headers.at b/tests/headers.at
index c7fb8083..7865341c 100644
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -55,15 +55,20 @@ m4_define([AT_TEST_CPP_GUARD_H],
 dirname=`AS_DIRNAME([$1])`
 AS_MKDIR_P([$dirname])
 
-AT_DATA([$1.y],
-[%%
+AT_DATA_GRAMMAR([$1.y],
+[%{
+#include "$1.h"
+%}
+%%
 dummy:;
+%%
+#include "$1.h"
 ])
 
-AT_CHECK([bison --defines=$1.h $1.y])
+AT_CHECK([bison --defines=$1.h --output=y.tab.c $1.y])
 
 # CPP should be happy with it.
-AT_CHECK([$CC -E $1.h], 0, [ignore])
+AT_CHECK([$CC -E -I. y.tab.c], 0, [ignore])
 
 AT_CLEANUP
 ])
@@ -80,7 +85,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 +110,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 +128,9 @@ main (void)
 
 # Link and execute, just to make sure everything is fine (and in
 # particular, that MY_LLOC is indeed defined somewhere).
-AT_COMPILE([caller], [caller.c input.c])
+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