X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=a6d8de3a236d834f6a06c81c34ac9f364ac13dd9;hb=d7965d19e72e6ba63fa807b2ea27adaedc9da109;hp=8be58e18f55fed21792b3861668de8d110f0162c;hpb=714ea20439a47287d31820eb71ef77e01a465d86;p=pspp-builds.git diff --git a/tests/automake.mk b/tests/automake.mk index 8be58e18..a6d8de3a 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -2,9 +2,14 @@ check_PROGRAMS += \ tests/data/datasheet-test \ + tests/data/sack \ tests/data/inexactify \ + tests/language/lexer/command-name-test \ + tests/language/lexer/scan-test \ + tests/language/lexer/segment-test \ tests/libpspp/abt-test \ tests/libpspp/bt-test \ + tests/libpspp/encoding-guesser-test \ tests/libpspp/heap-test \ tests/libpspp/hmap-test \ tests/libpspp/hmapx-test \ @@ -21,13 +26,21 @@ check_PROGRAMS += \ tests/libpspp/string-set-test \ tests/libpspp/stringi-set-test \ tests/libpspp/tower-test \ + tests/libpspp/u8-istream-test \ tests/output/render-test +check-programs: $(check_PROGRAMS) + tests_data_datasheet_test_SOURCES = \ tests/data/datasheet-test.c tests_data_datasheet_test_LDADD = src/libpspp-core.la $(LIBINTL) tests_data_datasheet_test_CFLAGS = $(AM_CFLAGS) +tests_data_sack_SOURCES = \ + tests/data/sack.c +tests_data_sack_LDADD = src/libpspp-core.la $(LIBINTL) +tests_data_sack_CFLAGS = $(AM_CFLAGS) + tests_libpspp_ll_test_SOURCES = \ src/libpspp/ll.c \ tests/libpspp/ll-test.c @@ -41,6 +54,10 @@ tests_libpspp_llx_test_SOURCES = \ tests_libpspp_llx_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_llx_test_CFLAGS = $(AM_CFLAGS) +tests_libpspp_encoding_guesser_test_SOURCES = \ + tests/libpspp/encoding-guesser-test.c +tests_libpspp_encoding_guesser_test_LDADD = src/libpspp/libpspp.la gl/libgl.la + tests_libpspp_heap_test_SOURCES = \ src/libpspp/heap.c \ src/libpspp/pool.c \ @@ -147,6 +164,9 @@ tests_libpspp_tower_test_SOURCES = \ tests_libpspp_tower_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_tower_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 +tests_libpspp_u8_istream_test_SOURCES = tests/libpspp/u8-istream-test.c +tests_libpspp_u8_istream_test_LDADD = src/libpspp/libpspp.la gl/libgl.la + tests_libpspp_sparse_array_test_SOURCES = \ src/libpspp/sparse-array.c \ src/libpspp/pool.c \ @@ -181,6 +201,45 @@ tests_dissect_sysfile_SOURCES = \ tests_dissect_sysfile_LDADD = gl/libgl.la $(LIBINTL) tests_dissect_sysfile_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\" +check_PROGRAMS += tests/language/lexer/command-name-test +tests_language_lexer_command_name_test_SOURCES = \ + src/data/identifier.c \ + src/language/lexer/command-name.c \ + tests/language/lexer/command-name-test.c +tests_language_lexer_command_name_test_LDADD = \ + src/libpspp/libpspp.la \ + gl/libgl.la \ + $(LIBINTL) +tests_language_lexer_command_name_test_CFLAGS = $(AM_CFLAGS) + +check_PROGRAMS += tests/language/lexer/scan-test +tests_language_lexer_scan_test_SOURCES = \ + src/data/identifier.c \ + src/language/lexer/command-name.c \ + src/language/lexer/scan.c \ + src/language/lexer/segment.c \ + src/language/lexer/token.c \ + src/libpspp/pool.c \ + src/libpspp/prompt.c \ + src/libpspp/str.c \ + src/libpspp/temp-file.c \ + tests/language/lexer/scan-test.c +tests_language_lexer_scan_test_LDADD = gl/libgl.la $(LIBINTL) +tests_language_lexer_scan_test_CFLAGS = $(AM_CFLAGS) + +check_PROGRAMS += tests/language/lexer/segment-test +tests_language_lexer_segment_test_SOURCES = \ + src/data/identifier.c \ + src/language/lexer/command-name.c \ + src/language/lexer/segment.c \ + src/libpspp/pool.c \ + src/libpspp/prompt.c \ + src/libpspp/str.c \ + src/libpspp/temp-file.c \ + tests/language/lexer/segment-test.c +tests_language_lexer_segment_test_LDADD = gl/libgl.la $(LIBINTL) +tests_language_lexer_segment_test_CFLAGS = $(AM_CFLAGS) + check_PROGRAMS += tests/output/render-test tests_output_render_test_SOURCES = tests/output/render-test.c tests_output_render_test_LDADD = \ @@ -224,6 +283,7 @@ TESTSUITE_AT = \ tests/data/datasheet-test.at \ tests/data/format-guesser.at \ tests/data/por-file.at \ + tests/data/sys-file-reader.at \ tests/data/sys-file.at \ tests/language/command.at \ tests/language/control/do-if.at \ @@ -241,6 +301,7 @@ TESTSUITE_AT = \ tests/language/data-io/inpt-pgm.at \ tests/language/data-io/list.at \ tests/language/data-io/match-files.at \ + tests/language/data-io/print-space.at \ tests/language/data-io/print.at \ tests/language/data-io/save.at \ tests/language/data-io/save-translate.at \ @@ -257,8 +318,11 @@ TESTSUITE_AT = \ tests/language/dictionary/weight.at \ tests/language/expressions/evaluate.at \ tests/language/expressions/parse.at \ + tests/language/lexer/command-name.at \ tests/language/lexer/lexer.at \ tests/language/lexer/q2c.at \ + tests/language/lexer/scan.at \ + tests/language/lexer/segment.at \ tests/language/lexer/variable-parser.at \ tests/language/stats/aggregate.at \ tests/language/stats/autorecode.at \ @@ -290,6 +354,7 @@ TESTSUITE_AT = \ tests/language/xforms/select-if.at \ tests/libpspp/abt.at \ tests/libpspp/bt.at \ + tests/libpspp/encoding-guesser.at \ tests/libpspp/float-format.at \ tests/libpspp/heap.at \ tests/libpspp/hmap.at \ @@ -307,6 +372,7 @@ TESTSUITE_AT = \ tests/libpspp/string-set.at \ tests/libpspp/stringi-set.at \ tests/libpspp/tower.at \ + tests/libpspp/u8-istream.at \ tests/math/moments.at \ tests/math/randist.at \ tests/output/charts.at \ @@ -318,6 +384,7 @@ TESTSUITE_AT = \ TESTSUITE = $(srcdir)/tests/testsuite DISTCLEANFILES += tests/atconfig tests/atlocal $(TESTSUITE) +AUTOTEST_PATH = tests/data:tests/language/lexer:tests/libpspp:tests/output:src/ui/terminal $(srcdir)/tests/testsuite.at: tests/testsuite.in tests/automake.mk cp $< $@ @@ -328,7 +395,7 @@ EXTRA_DIST += tests/testsuite.at CHECK_LOCAL += tests_check tests_check: tests/atconfig tests/atlocal $(TESTSUITE) $(check_PROGRAMS) - $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=tests/data:tests/libpspp:tests/output:src/ui/terminal $(TESTSUITEFLAGS) + $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) $(TESTSUITEFLAGS) CLEAN_LOCAL += tests_clean tests_clean: @@ -337,7 +404,7 @@ tests_clean: AUTOM4TE = $(SHELL) $(srcdir)/build-aux/missing --run autom4te AUTOTEST = $(AUTOM4TE) --language=autotest $(TESTSUITE): package.m4 $(srcdir)/tests/testsuite.at $(TESTSUITE_AT) - $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at + $(AUTOTEST) -I '$(srcdir)' $@.at | sed 's/@<00A0>@/ /g' > $@.tmp mv $@.tmp $@ # The `:;' works around a Bash 3.2 bug when the output is not writeable. @@ -351,3 +418,27 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac echo 'm4_define([AT_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])' && \ echo 'm4_define([AT_PACKAGE_URL], [$(PACKAGE_URL)])'; \ } >'$(srcdir)/package.m4' + +# valgrind support for Autotest testsuite + +valgrind_wrappers = \ + tests/valgrind/pspp \ + tests/valgrind/render-test + +$(valgrind_wrappers): tests/valgrind-wrapper.in + @test -d tests/valgrind || mkdir tests/valgrind + sed -e 's,[@]wrap_program[@],$@,' \ + $(top_srcdir)/tests/valgrind-wrapper.in > $@.tmp + chmod +x $@.tmp + mv $@.tmp $@ +CLEANFILES += $(valgrind_wrappers) +EXTRA_DIST += tests/valgrind-wrapper.in + +VALGRIND = $(SHELL) $(abs_top_builddir)/libtool --mode=execute valgrind --log-file=valgrind.%p --leak-check=full --num-callers=20 +check-valgrind: all tests/atconfig tests/atlocal $(TESTSUITE) $(valgrind_wrappers) + $(SHELL) '$(TESTSUITE)' -C tests VALGRIND='$(VALGRIND)' AUTOTEST_PATH='tests/valgrind:$(AUTOTEST_PATH)' -d $(TESTSUITEFLAGS) + @echo + @echo '--------------------------------' + @echo 'Valgrind output is in:' + @echo 'tests/testsuite.dir/*/valgrind.*' + @echo '--------------------------------'