Catch up to last couple of days' checkins.

[bison.git] / tests / headers.at

diff --git a/tests/headers.at b/tests/headers.at
index 81d5c7dc90d6e76f178445f00e1f3bf71b7c4725..1a827a4caafc6fdb9d00201fd374841b4636ebc3 100644 (file)
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -13,8 +13,8 @@
 
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 AT_BANNER([[Parser Headers.]])
 
@@ -56,14 +56,19 @@ dirname=`AS_DIRNAME([$1])`
 AS_MKDIR_P([$dirname])
 
 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
 ])