X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=661bfbb9a562024fedf804f069f8140cc45c566b;hb=refs%2Fheads%2Fpivot-table2;hp=b8e4c2dd19613c3fae94fd8f7641d4c2f13fcb1c;hpb=20af4ead4d4c440c5bc269274cd5a87fa9e7056d;p=pspp diff --git a/tests/automake.mk b/tests/automake.mk index b8e4c2dd19..661bfbb9a5 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -9,6 +9,7 @@ check_PROGRAMS += \ tests/language/lexer/segment-test \ tests/libpspp/abt-test \ tests/libpspp/bt-test \ + tests/libpspp/cmac-aes256-test \ tests/libpspp/encoding-guesser-test \ tests/libpspp/heap-test \ tests/libpspp/hmap-test \ @@ -30,7 +31,9 @@ check_PROGRAMS += \ tests/libpspp/tower-test \ tests/libpspp/u8-istream-test \ tests/libpspp/zip-test \ - tests/output/render-test + tests/output/render-test \ + tests/ui/syntax-gen-test + check-programs: $(check_PROGRAMS) @@ -93,6 +96,11 @@ tests_libpspp_bt_test_SOURCES = \ tests/libpspp/bt-test.c tests_libpspp_bt_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 +tests_libpspp_cmac_aes256_test_SOURCES = \ + src/libpspp/cmac-aes256.c \ + tests/libpspp/cmac-aes256-test.c +tests_libpspp_cmac_aes256_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 + tests_libpspp_range_map_test_SOURCES = \ src/libpspp/bt.c \ src/libpspp/range-map.c \ @@ -151,7 +159,9 @@ tests_libpspp_sparse_array_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la tests_libpspp_sparse_xarray_test_SOURCES = \ tests/libpspp/sparse-xarray-test.c tests_libpspp_sparse_xarray_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 -tests_libpspp_sparse_xarray_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la +tests_libpspp_sparse_xarray_test_LDADD = src/libpspp/liblibpspp.la \ + src/libpspp-core.la \ + gl/libgl.la tests_data_inexactify_SOURCES = tests/data/inexactify.c @@ -192,12 +202,13 @@ tests_language_lexer_segment_test_LDADD = \ check_PROGRAMS += tests/libpspp/zip-test tests_libpspp_zip_test_SOURCES = \ tests/libpspp/zip-test.c + tests_libpspp_zip_test_CFLAGS = $(AM_CFLAGS) tests_libpspp_zip_test_LDADD = \ src/libpspp/liblibpspp.la \ + src/libpspp-core.la \ gl/libgl.la - check_PROGRAMS += tests/output/render-test tests_output_render_test_SOURCES = tests/output/render-test.c tests_output_render_test_LDADD = \ @@ -205,23 +216,32 @@ tests_output_render_test_LDADD = \ src/libpspp-core.la \ $(CAIRO_LIBS) + +check_PROGRAMS += tests/ui/syntax-gen-test +tests_ui_syntax_gen_test_SOURCES = tests/ui/syntax-gen-test.c +tests_ui_syntax_gen_test_LDADD = \ + src/ui/libuicommon.la \ + src/libpspp-core.la \ + $(CAIRO_LIBS) + + EXTRA_DIST += \ tests/coverage.sh \ tests/data/bcd-in.expected.cmp.gz \ tests/data/binhex-in.expected.cmp.gz \ tests/data/binhex-out.expected.gz \ + tests/data/hotel-encrypted.sav \ tests/data/legacy-in.expected.cmp.gz \ tests/data/num-in.expected.gz \ tests/data/num-out-cmp.pl \ tests/data/num-out.expected.cmp.gz \ tests/data/v13.sav \ tests/data/v14.sav \ - tests/language/data-io/Book1.gnm.unzipped \ - tests/language/data-io/test.ods + tests/language/data-io/Book1.gnm.unzipped \ + tests/language/data-io/test.ods \ + tests/language/data-io/newone.ods CLEANFILES += *.save pspp.* foo* - -EXTRA_DIST += tests/OChangeLog # Autotest testsuite @@ -238,10 +258,13 @@ TESTSUITE_AT = \ tests/data/data-in.at \ tests/data/data-out.at \ tests/data/datasheet-test.at \ + tests/data/dictionary.at \ tests/data/format-guesser.at \ + tests/data/pc+-file-reader.at \ tests/data/por-file.at \ tests/data/sys-file-reader.at \ tests/data/sys-file.at \ + tests/data/sys-file-encryption.at \ tests/language/command.at \ tests/language/control/do-if.at \ tests/language/control/do-repeat.at \ @@ -265,6 +288,7 @@ TESTSUITE_AT = \ tests/language/data-io/save-translate.at \ tests/language/data-io/update.at \ tests/language/dictionary/attributes.at \ + tests/language/dictionary/delete-variables.at \ tests/language/dictionary/formats.at \ tests/language/dictionary/missing-values.at \ tests/language/dictionary/mrsets.at \ @@ -289,10 +313,12 @@ TESTSUITE_AT = \ tests/language/stats/crosstabs.at \ tests/language/stats/descriptives.at \ tests/language/stats/examine.at \ + tests/language/stats/graph.at \ tests/language/stats/factor.at \ tests/language/stats/flip.at \ tests/language/stats/frequencies.at \ tests/language/stats/glm.at \ + tests/language/stats/logistic.at \ tests/language/stats/means.at \ tests/language/stats/npar.at \ tests/language/stats/oneway.at \ @@ -347,23 +373,25 @@ TESTSUITE_AT = \ tests/output/output.at \ tests/output/paper-size.at \ tests/output/render.at \ + tests/output/tables.at \ tests/ui/terminal/main.at \ + tests/ui/syntax-gen.at \ tests/perl-module.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 +AUTOTEST_PATH = tests/data:tests/language/lexer:tests/libpspp:tests/output:src/ui/terminal:utilities $(srcdir)/tests/testsuite.at: tests/testsuite.in tests/automake.mk - cp $< $@ - for t in $(TESTSUITE_AT); do \ + $(AM_V_GEN)cp $< $@ + $(AM_V_at)for t in $(TESTSUITE_AT); do \ echo "m4_include([$$t])" >> $@ ;\ done EXTRA_DIST += tests/testsuite.at CHECK_LOCAL += tests_check tests_check: tests/atconfig tests/atlocal $(TESTSUITE) $(check_PROGRAMS) - $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) $(TESTSUITEFLAGS) + XTERM_LOCALE='' $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) $(TESTSUITEFLAGS) CLEAN_LOCAL += tests_clean tests_clean: @@ -372,12 +400,12 @@ 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)' $@.at | sed 's/@<00A0>@/ /g' > $@.tmp - mv $@.tmp $@ + $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' $@.at | sed 's/@<00A0>@/ /g' > $@.tmp + $(AM_V_at)mv $@.tmp $@ # The `:;' works around a Bash 3.2 bug when the output is not writeable. $(srcdir)/package.m4: $(top_srcdir)/configure.ac - :;{ \ + $(AM_V_GEN):;{ \ echo '# Signature of the current package.' && \ echo 'm4_define([AT_PACKAGE_NAME], [$(PACKAGE_NAME)])' && \ echo 'm4_define([AT_PACKAGE_TARNAME], [$(PACKAGE_TARNAME)])' && \ @@ -416,20 +444,21 @@ valgrind_wrappers = \ tests/valgrind/tower-test \ tests/valgrind/u8-istream-test \ tests/valgrind/render-test \ + tests/valgrind/pspp-convert \ tests/valgrind/pspp $(valgrind_wrappers): tests/valgrind-wrapper.in @$(MKDIR_P) tests/valgrind - sed -e 's,[@]wrap_program[@],$@,' \ + $(AM_V_GEN)sed -e 's,[@]wrap_program[@],$@,' \ $(top_srcdir)/tests/valgrind-wrapper.in > $@.tmp - chmod +x $@.tmp - mv $@.tmp $@ + $(AM_V_at)chmod +x $@.tmp + $(AM_V_at)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) + XTERM_LOCALE='' $(SHELL) '$(TESTSUITE)' -C tests VALGRIND='$(VALGRIND)' AUTOTEST_PATH='tests/valgrind:$(AUTOTEST_PATH)' -d $(TESTSUITEFLAGS) @echo @echo '--------------------------------' @echo 'Valgrind output is in:'