From ce3448d5b9133a0e6d27d6d36d29f4f7a4316dc7 Mon Sep 17 00:00:00 2001 From: "Joel E. Denny" Date: Tue, 3 Jul 2007 14:08:29 +0000 Subject: [PATCH 1/1] Fix C++ test cases after recent Gnulib changes. Discussed starting at . * examples/calc++/Makefile.am (DEFAULT_INCLUDES): Override Automake's definition in order to avoid Gnulib headers since we don't use config.h here. * tests/output.at (AT_CHECK_OUTPUT_FILE_NAME): Use AT_DATA_GRAMMAR rather than AT_DATA so that config.h is included. --- ChangeLog | 10 ++++++++++ examples/calc++/Makefile.am | 1 + tests/output.at | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f1ff2fb8..9c261894 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-07-02 Joel E. Denny + + Fix C++ test cases after recent Gnulib changes. Discussed starting at + . + * examples/calc++/Makefile.am (DEFAULT_INCLUDES): Override Automake's + definition in order to avoid Gnulib headers since we don't use config.h + here. + * tests/output.at (AT_CHECK_OUTPUT_FILE_NAME): Use AT_DATA_GRAMMAR + rather than AT_DATA so that config.h is included. + 2007-07-01 Joel E. Denny * data/glr.c (yy_yypstack, yypstates, yypdumpstack): Use YYFPRINTF diff --git a/examples/calc++/Makefile.am b/examples/calc++/Makefile.am index f4573d72..29fdafe8 100644 --- a/examples/calc++/Makefile.am +++ b/examples/calc++/Makefile.am @@ -44,6 +44,7 @@ $(calc_extracted): $(doc) $(extexi) ## Parser generation. ## ## ------------------- ## +DEFAULT_INCLUDES = -I. -I$(srcdir) BUILT_SOURCES = $(calc_extracted) $(calc_sources_generated) CLEANFILES = $(srcdir)/*.output *.tmp MAINTAINERCLEANFILES = $(srcdir)/*.stamp $(BUILT_SOURCES) diff --git a/tests/output.at b/tests/output.at index 06f30c79..1343b99a 100644 --- a/tests/output.at +++ b/tests/output.at @@ -157,7 +157,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); @@ -171,7 +171,7 @@ 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*); } %% -- 2.45.2