diff options
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 257 |
1 files changed, 66 insertions, 191 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 65f9d65..24ab7dd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -24,22 +24,16 @@ AM_CFLAGS = $(WARNINGFLAGS) TESTS = $(check_PROGRAMS) options.cn # The script testwrapper.sh will run most tests as is. A couple tests -# in the suite end in .reject, .table and the like so that we can pass +# in the suite end in .direct, .cn. and the like so that we can pass # different arguments to the test runner. We list those extensions so # automake knows how to distinguish between the various kinds of tests # we have. -TEST_EXTENSIONS = .reject .table .direct .cn .i3 .pthread .one .opt .ser .ver +TEST_EXTENSIONS = .direct .cn .i3 .pthread .opt .ser .ver LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh AM_LOG_FLAGS = -d $(srcdir) -r -REJECT_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh -AM_REJECT_LOG_FLAGS = -d $(srcdir) -i $(srcdir)/reject.txt -r - -TABLE_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh -AM_TABLE_LOG_FLAGS = -d $(builddir) -i $(srcdir)/reject.txt -t - DIRECT_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper-direct.sh AM_DIRECT_LOG_FLAGS = -b $(abs_builddir) -s $(srcdir) @@ -52,56 +46,49 @@ AM_I3_LOG_FLAGS = -i $(srcdir)/cxx_yywrap.txt -i $(srcdir)/cxx_yywrap.txt -i $(s PTHREAD_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh AM_PTHREAD_LOG_FLAGS = -i $(srcdir)/pthread_1.txt -i $(srcdir)/pthread_2.txt -i $(srcdir)/pthread_3.txt -i $(srcdir)/pthread_4.txt -i $(srcdir)/pthread_5.txt -ONE_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh -AM_ONE_LOG_FLAGS = -1 -d $(srcdir) +OPT_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh +AM_OPT_LOG_FLAGS = -d $(srcdir) -i $(srcdir)/tableopts.txt -r + +SER_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh +AM_SER_LOG_FLAGS = -d $(builddir) -i $(srcdir)/tableopts.txt -r + +VER_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh +AM_VER_LOG_FLAGS = -d $(builddir) -i $(srcdir)/tableopts.txt -r AM_YFLAGS = -d -p test AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src -check_PROGRAMS = $(simple_tests) $(reject_tests) $(TABLE_TESTS) $(DIRECT_TESTS) $(I3_TESTS) $(PTHREAD_TESTS) $(ONE_TESTS) $(TABLEOPTS_TESTS) +check_PROGRAMS = $(RULESET_TESTS) $(SPORADIC_TESTS) $(DIRECT_TESTS) $(I3_TESTS) $(PTHREAD_TESTS) -simple_tests = \ - alloc_extra \ - array_nr \ - array_r \ - basic_nr \ - basic_r \ +SPORADIC_TESTS = \ + alloc_extra_nr \ + alloc_extra_c99 \ bison_nr \ bison_yylloc \ bison_yylval \ c_cxx_nr \ c_cxx_r \ - ccl \ cxx_basic \ cxx_multiple_scanners \ cxx_restart \ - debug_nr \ - debug_r \ - extended \ header_nr \ header_r \ mem_nr \ mem_r \ + mem_c99 \ multiple_scanners_nr \ multiple_scanners_r \ - posix \ - posixly_correct \ prefix_nr \ prefix_r \ - quote_in_comment \ + prefix_c99 \ quotes \ string_nr \ string_r \ + string_c99 \ top \ - yyextra + yyextra_nr \ + yyextra_c99 -reject_tests = \ - reject_nr.reject \ - reject_r.reject - -TABLE_TESTS = \ - reject_ver.table \ - reject_ser.table DIRECT_TESTS = \ include_by_buffer.direct \ @@ -116,17 +103,8 @@ I3_TESTS = \ PTHREAD_TESTS = \ pthread.pthread -ONE_TESTS = \ - lineno_nr.one \ - lineno_r.one \ - lineno_trailing.one - -quote_in_comment_SOURCES = quote_in_comment.l -alloc_extra_SOURCES = alloc_extra.l -array_nr_SOURCES = array_nr.l -array_r_SOURCES = array_r.l -basic_nr_SOURCES = basic_nr.l -basic_r_SOURCES = basic_r.l +alloc_extra_nr_SOURCES = alloc_extra_nr.l +alloc_extra_c99_SOURCES = alloc_extra_c99.l if HAVE_BISON bison_nr_SOURCES = bison_nr_scanner.l bison_nr_parser.y bison_nr_main.c nodist_bison_nr_SOURCES = bison_nr_parser.h bison_nr_scanner.h @@ -141,14 +119,10 @@ bison_yylval_SOURCES = no_bison_stub.c endif c_cxx_nr_SOURCES = c_cxx_nr.lll c_cxx_r_SOURCES = c_cxx_r.lll -ccl_SOURCES = ccl.l cxx_basic_SOURCES = cxx_basic.ll cxx_restart_SOURCES = cxx_restart.ll cxx_multiple_scanners_SOURCES = cxx_multiple_scanners_main.cc cxx_multiple_scanners_1.ll cxx_multiple_scanners_2.ll cxx_yywrap_i3_SOURCES = cxx_yywrap.ll -debug_nr_SOURCES = debug_nr.l -debug_r_SOURCES = debug_r.l -extended_SOURCES = extended.l header_nr_SOURCES = header_nr_scanner.l header_nr_main.c nodist_header_nr_SOURCES = header_nr_scanner.h header_r_SOURCES = header_r_scanner.l header_r_main.c @@ -156,32 +130,27 @@ nodist_header_r_SOURCES = header_r_scanner.h include_by_buffer_direct_SOURCES = include_by_buffer.direct.l include_by_push_direct_SOURCES = include_by_push.direct.l include_by_reentrant_direct_SOURCES = include_by_reentrant.direct.l -lineno_nr_one_SOURCES = lineno_nr.l -lineno_r_one_SOURCES = lineno_r.l -lineno_trailing_one_SOURCES = lineno_trailing.l mem_nr_SOURCES = mem_nr.l mem_r_SOURCES = mem_r.l +mem_c99_SOURCES = mem_c99.l multiple_scanners_nr_SOURCES = multiple_scanners_nr_main.c multiple_scanners_nr_1.l multiple_scanners_nr_2.l nodist_multiple_scanners_nr_SOURCES = multiple_scanners_nr_1.h multiple_scanners_nr_2.h multiple_scanners_r_SOURCES = multiple_scanners_r_main.c multiple_scanners_r_1.l multiple_scanners_r_2.l nodist_multiple_scanners_r_SOURCES = multiple_scanners_nr_1.h multiple_scanners_nr_2.h -posix_SOURCES = posix.l -posixly_correct_SOURCES = posixly_correct.l prefix_nr_SOURCES = prefix_nr.l prefix_r_SOURCES = prefix_r.l +prefix_c99_SOURCES = prefix_c99.l pthread_pthread_SOURCES = pthread.l quotes_SOURCES = quotes.l -reject_nr_reject_SOURCES = reject.l4 -reject_r_reject_SOURCES = reject.l4 -reject_ver_table_SOURCES = reject.l4 -reject_ser_table_SOURCES = reject.l4 rescan_nr_direct_SOURCES = rescan_nr.direct.l rescan_r_direct_SOURCES = rescan_r.direct.l string_nr_SOURCES = string_nr.l string_r_SOURCES = string_r.l +string_c99_SOURCES = string_c99.l top_SOURCES = top.l top_main.c nodist_top_SOURCES = top.h -yyextra_SOURCES = yyextra.l +yyextra_nr_SOURCES = yyextra_nr.l +yyextra_c99_SOURCES = yyextra_c99.l # Normally, automake would distribute files built by flex. Since the # point of the test suite is to test the files that flex builds, and @@ -193,11 +162,8 @@ yyextra_SOURCES = yyextra.l # it. CLEANFILES = \ - alloc_extra.c \ - array_nr.c \ - array_r.c \ - basic_nr.c \ - basic_r.c \ + alloc_extra_nr.c \ + alloc_extra_c99.c \ bison_nr_parser.c \ bison_nr_parser.h \ bison_nr_scanner.c \ @@ -212,15 +178,13 @@ CLEANFILES = \ bison_yylval_scanner.h \ c_cxx_nr.cc \ c_cxx_r.cc \ - ccl.c \ + ccl_* \ + !ccl.rules \ cxx_basic.cc \ cxx_multiple_scanners_1.cc \ cxx_multiple_scanners_2.cc \ cxx_restart.cc \ cxx_yywrap.cc \ - debug_nr.c \ - debug_r.c \ - extended.c \ header_nr_scanner.c \ header_nr_scanner.h \ header_r_scanner.c \ @@ -228,11 +192,9 @@ CLEANFILES = \ include_by_buffer.direct.c \ include_by_push.direct.c \ include_by_reentrant.direct.c \ - lineno_nr.c \ - lineno_r.c \ - lineno_trailing.c \ mem_nr.c \ mem_r.c \ + mem_c99.c \ multiple_scanners_nr_1.c \ multiple_scanners_nr_1.h \ multiple_scanners_nr_2.c \ @@ -241,28 +203,25 @@ CLEANFILES = \ multiple_scanners_r_1.h \ multiple_scanners_r_2.c \ multiple_scanners_r_2.h \ - posix.c \ - posixly_correct.c \ prefix_nr.c \ prefix_r.c \ + prefix_c99.c \ pthread.c \ - quote_in_comment.c \ quotes.c \ - reject_nr.reject.c \ - reject_r.reject.c \ - reject_ser.table.c \ - reject_ser.table.tables \ - reject_ver.table.c \ - reject_ver.table.tables \ + quotes_c99.c \ rescan_nr.direct.c \ rescan_r.direct.c \ string_nr.c \ string_r.c \ + string_c99.c \ + string_c99.c \ top.c \ top.h \ - yyextra.c \ - $(tableopts_c) \ - $(tableopts_tables) + yyextra_nr.c \ + yyextra_c99.c \ + yyunput_* \ + !yyunput.rules \ + $(RULESET_REMOVABLES) dist-hook: chmod u+w $(distdir) && \ @@ -272,24 +231,19 @@ dist-hook: EXTRA_DIST = \ README \ + testmaker.m4 \ alloc_extra.txt \ array_nr.txt \ array_r.txt \ - basic_nr.txt \ - basic_r.txt \ bison_nr.txt \ bison_yylloc.txt \ bison_yylval.txt \ c_cxx_nr.txt \ c_cxx_r.txt \ - ccl.txt \ cxx_basic.txt \ cxx_multiple_scanners.txt \ cxx_restart.txt \ cxx_yywrap.txt \ - debug_nr.txt \ - debug_r.txt \ - extended.txt \ header_nr.txt \ header_r.txt \ include_by_buffer.direct.txt \ @@ -313,34 +267,35 @@ EXTRA_DIST = \ pthread_3.txt \ pthread_4.txt \ pthread_5.txt \ - reject.txt \ rescan_nr.direct.txt \ rescan_r.direct.txt \ - quote_in_comment.txt \ quotes.txt \ + tableopts.txt \ top.txt \ - yyextra.txt \ - tableopts.txt + yyextra.txt dist_noinst_SCRIPTS = \ - tableopts.sh + ruleset.sh dist_check_SCRIPTS = \ options.cn \ testwrapper-direct.sh \ - testwrapper.sh + testwrapper.sh \ + testmaker.sh pthread_pthread_LDADD = @LIBPTHREAD@ # specify how to process .l files in order to test the flex built by make all +TESTOPTS = -L + FLEX = $(top_builddir)/src/flex .l.c: $(FLEX) - $(AM_V_LEX)$(FLEX) -o $@ $< + $(AM_V_LEX)$(FLEX) $(TESTOPTS) -o $@ $< .ll.cc: $(FLEX) - $(AM_V_LEX)$(FLEX) -+ -o $@ $< + $(AM_V_LEX)$(FLEX) $(TESTOPTS) -+ -o $@ $< bison_nr_main.$(OBJEXT): bison_nr_parser.h bison_nr_scanner.h bison_nr_scanner.$(OBJEXT): bison_nr_parser.h @@ -367,7 +322,7 @@ bison_yylval_scanner.h: bison_yylval_scanner.c # so we explicitly sayhow, using the .lll suffix for the lex input file .lll.cc: $(FLEX) - $(AM_V_LEX)$(FLEX) -o $@ $< + $(AM_V_LEX)$(FLEX) $(TESTOPTS) -o $@ $< header_nr_main.$(OBJEXT): header_nr_scanner.h @@ -401,108 +356,28 @@ multiple_scanners_r_2.h: multiple_scanners_r_2.c @if test ! -f $@; then rm -f $<; else :; fi @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) $<; else :; fi -posixly_correct.c: posixly_correct.l $(FLEX) - $(AM_V_LEX)POSIXLY_CORRECT=1 $(FLEX) -o $@ $< - -reject_nr.reject.c: reject.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -o $@ $< - -reject_nr.reject$(EXEEXT): reject_nr.reject.$(OBJEXT) - $(AM_V_CCLD)$(LINK) $^ - -reject_r.reject.c: reject.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape --reentrant -o $@ $< - -reject_r.reject.$(OBJEXT): reject_r.reject.c - $(AM_V_CC)$(COMPILE) -DTEST_IS_REENTRANT -c -o $@ $< - -reject_r.reject$(EXEEXT): reject_r.reject.$(OBJEXT) - $(AM_V_CCLD)$(LINK) $^ - -reject_ver.table.c: reject.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -o $@ --tables-verify --tables-file=$(basename $@).tables $< - -reject_ver.table.$(OBJEXT): reject_ver.table.c - $(AM_V_CC)$(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< - -reject_ver.table$(EXEEXT): reject_ver.table.$(OBJEXT) - $(AM_V_CCLD)$(LINK) $^ - -reject_ser.table.c: reject.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) -o $@ --unsafe-no-m4-sect3-escape --tables-file=$(basename $@).tables $< - -reject_ser.table.$(OBJEXT): reject_ser.table.c - $(AM_V_CC)$(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< - -reject_ser.table$(EXEEXT): reject_ser.table.$(OBJEXT) - $(AM_V_CCLD)$(LINK) $^ - top_main.$(OBJEXT): top.h top.h: top.c -# We separate out the tableopts _SOURCES variables and the linking -# rules for those programs because automake has no way to specify such -# things with a loop in a variable (even though make can do such -# things) and the resultant list is both long an unenlightening. And -# it can be / is generated by a shell script, tableopts.sh. - -$(srcdir)/tableopts.am: tableopts.sh - $(SHELL) $(srcdir)/tableopts.sh > $(srcdir)/tableopts.am - -include $(srcdir)/tableopts.am - -tableopts := -Ca -Ce -Cf -CF -Cm -Cem -Cae -Caef -CaeF -Cam -Caem -tableopts_opt_tests := $(foreach opt,$(tableopts), tableopts_opt_nr$(opt) tableopts_opt_r$(opt)) -tableopts_sertests := $(foreach opt,$(tableopts), tableopts_ser_nr$(opt) tableopts_ser_r$(opt)) -tableopts_vertests := $(foreach opt,$(tableopts), tableopts_ver_nr$(opt) tableopts_ver_r$(opt)) -tableopts_tests := $(tableopts_opttests) $(tableopts_vertests) $(tableopts_sertests) - -tableopts_c := $(addsuffix .c,$(tableopts_tests)) - -OPT_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh -AM_OPT_LOG_FLAGS = -d $(srcdir) -i $(srcdir)/tableopts.txt -r - -tableopts_opt_nr%.c: tableopts.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) $(*:_F=F) -o $@ $< +# Build rules for non-C back ends -tableopts_opt_nr%.$(OBJEXT): tableopts_opt_nr%.c - $(AM_V_CC)$(COMPILE) -c -o $@ $< +.l.go: + $(AM_V_LEX)$(FLEX) $(TESTOPTS) -o $@ $< -tableopts_opt_r%.c: tableopts.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) --reentrant $(subst _F,F,$*) -o $@ $< - -tableopts_opt_r%.$(OBJEXT): tableopts_opt_r%.c - $(AM_V_CC)$(COMPILE) -DTEST_IS_REENTRANT -c -o $@ $< - -SER_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh -AM_SER_LOG_FLAGS = -d $(builddir) -i $(srcdir)/tableopts.txt -r -t - -tableopts_ser_nr%.c: tableopts.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) --tables-file="tableopts_ser_nr$*.ser.tables" $(subst _F,F,$*) -o $@ $< - -tableopts_ser_nr%.$(OBJEXT): tableopts_ser_nr%.c - $(AM_V_CC)$(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< - -tableopts_ser_r%.c: tableopts.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) -R --tables-file="tableopts_ser_r$*.ser.tables" $(subst _F,F,$*) -o $@ $< - -tableopts_ser_r%.$(OBJEXT): tableopts_ser_r%.c - $(AM_V_CC)$(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -DTEST_IS_REENTRANT -c -o $@ $< - -VER_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh -AM_VER_LOG_FLAGS = -d $(builddir) -i $(srcdir)/tableopts.txt -r -t +# This is a temporary fake rule for use while the Go back end still +# actually generates C. +.go: + $(CC) $< -o $*_go -tableopts_ver_nr%.c: tableopts.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) --tables-file="tableopts_ver_nr$*.ver.tables" --tables-verify $(subst _F,F,$*) -o $@ $< +# Most test productions can be autogenerated from ruleset files, but +# automake has no way to specify such things with a loop in a variable +# (even though make can do such things) and the resultant list is both +# long and unenlightening. And it can be / is generated by a shell +# script, ruleset.sh. -tableopts_ver_nr%.$(OBJEXT): tableopts_ver_nr%.c - $(AM_V_CC)$(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< +$(srcdir)/ruleset.am: $(srcdir)/ruleset.sh $(srcdir)/*.rules + $(SHELL) $(srcdir)/ruleset.sh nr r c99 go > $(srcdir)/ruleset.am -tableopts_ver_nr%.ver$(EXEEXT): tableopts_ver_nr%.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $^ +include $(srcdir)/ruleset.am -tableopts_ver_r%.c: tableopts.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) -R --tables-file="tableopts_ver_r$*.ver.tables" --tables-verify $(subst _F,F,$*) -o $@ $< -tableopts_ver_r%.$(OBJEXT): tableopts_ver_r%.c - $(AM_V_CC)$(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -DTEST_IS_REENTRANT -c -o $@ $< |