X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=392c4c4f70c3c9ce2a9e6e866eae9e16d2a72727;hb=4f1824e67832a060c2884ab1fa862e7094ee995b;hp=a95bf3e5c2e3ff21c7edcc2a7f7a01c7239d9b54;hpb=d94dc663529b4e05ec1e7c47c1e73310abb1d3b4;p=pspp diff --git a/tests/automake.mk b/tests/automake.mk index a95bf3e5c2..392c4c4f70 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -102,20 +102,14 @@ dist_TESTS = \ tests/formats/360.sh \ tests/bugs/agg_crash.sh \ tests/bugs/agg-crash-2.sh \ - tests/bugs/alpha-freq.sh \ tests/bugs/big-input.sh \ tests/bugs/big-input-2.sh \ tests/bugs/case-map.sh \ tests/bugs/comment-at-eof.sh \ tests/bugs/compute-fmt.sh \ tests/bugs/compression.sh \ - tests/bugs/crosstabs.sh \ - tests/bugs/crosstabs2.sh \ - tests/bugs/crosstabs-crash.sh \ - tests/bugs/crosstabs-crash2.sh \ tests/bugs/curtailed.sh \ tests/bugs/data-crash.sh \ - tests/bugs/double-frequency.sh \ tests/bugs/empty-do-repeat.sh \ tests/bugs/get.sh \ tests/bugs/examine-crash.sh \ @@ -124,9 +118,7 @@ dist_TESTS = \ tests/bugs/examine-1sample.sh \ tests/bugs/examine-missing.sh \ tests/bugs/examine-missing2.sh \ - tests/bugs/freq-nolabels.sh \ tests/bugs/get-no-file.sh \ - tests/bugs/html-frequency.sh \ tests/bugs/if_crash.sh \ tests/bugs/input-crash.sh \ tests/bugs/lag_crash.sh \ @@ -135,7 +127,6 @@ dist_TESTS = \ tests/bugs/multipass.sh \ tests/bugs/overwrite-input-file.sh \ tests/bugs/overwrite-special-file.sh \ - tests/bugs/piechart.sh \ tests/bugs/random.sh \ tests/bugs/shbang.sh \ tests/bugs/signals.sh \ @@ -153,7 +144,6 @@ dist_TESTS = \ tests/bugs/computebug.sh \ tests/bugs/compute-lv.sh \ tests/bugs/compute-sum.sh \ - tests/bugs/temp-freq.sh \ tests/bugs/print-crash.sh \ tests/bugs/keep-all.sh \ tests/data/datasheet-test.sh \ @@ -164,9 +154,6 @@ dist_TESTS = \ tests/stats/descript-missing.sh \ tests/stats/descript-mean-bug.sh \ tests/stats/moments.sh \ - tests/stats/percentiles-compatible.sh \ - tests/stats/ntiles.sh \ - tests/stats/percentiles-enhanced.sh \ tests/expressions/expressions.sh \ tests/expressions/epoch.sh \ tests/expressions/randist.sh \ @@ -194,6 +181,8 @@ nodist_TESTS = \ tests/libpspp/range-set-test \ tests/libpspp/sparse-array-test \ tests/libpspp/str-test \ + tests/libpspp/string-map-test \ + tests/libpspp/string-set-test \ tests/libpspp/tower-test TESTS = $(dist_TESTS) $(nodist_TESTS) @@ -202,20 +191,14 @@ check_PROGRAMS += \ $(nodist_TESTS) \ tests/data/datasheet-test \ tests/formats/inexactify \ - tests/libpspp/sparse-xarray-test + tests/libpspp/sparse-xarray-test \ + tests/output/render-test tests_data_datasheet_test_SOURCES = \ tests/data/datasheet-test.c tests_data_datasheet_test_LDADD = gl/libgl.la src/libpspp-core.la $(LIBINTL) tests_data_datasheet_test_CFLAGS = $(AM_CFLAGS) -# This seems to be necessary as the libtool artifacts aren't removed -# Automake bug ? -tests_data_datasheet_test_CLEAN: - rm -fr tests/data - -CLEAN_LOCAL += tests_data_datasheet_test_CLEAN - tests_libpspp_ll_test_SOURCES = \ src/libpspp/ll.c \ src/libpspp/ll.h \ @@ -295,6 +278,23 @@ tests_libpspp_str_test_SOURCES = \ tests/libpspp/str-test.c tests_libpspp_str_test_LDADD = src/libpspp/libpspp.la gl/libgl.la $(LIBINTL) +tests_libpspp_string_map_test_SOURCES = \ + src/libpspp/hash-functions.c \ + src/libpspp/hmap.c \ + src/libpspp/string-map.c \ + src/libpspp/string-set.c \ + tests/libpspp/string-map-test.c +tests_libpspp_string_map_test_LDADD = gl/libgl.la $(LIBINTL) +tests_libpspp_string_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 + +tests_libpspp_string_set_test_SOURCES = \ + src/libpspp/hash-functions.c \ + src/libpspp/hmap.c \ + src/libpspp/string-set.c \ + tests/libpspp/string-set-test.c +tests_libpspp_string_set_test_LDADD = gl/libgl.la $(LIBINTL) +tests_libpspp_string_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 + tests_libpspp_tower_test_SOURCES = \ src/libpspp/abt.c \ src/libpspp/abt.h \ @@ -340,6 +340,15 @@ tests_dissect_sysfile_SOURCES = \ tests_dissect_sysfile_LDADD = gl/libgl.la $(LIBINTL) tests_dissect_sysfile_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\" +check_PROGRAMS += tests/output/render-test +tests_output_render_test_SOURCES = tests/output/render-test.c +tests_output_render_test_LDADD = \ + src/libpspp.la \ + src/libpspp-core.la \ + $(CAIRO_LIBS) \ + $(LIBICONV) \ + $(LIBINTL) + EXTRA_DIST += \ $(dist_TESTS) \ tests/Book1.gnm.unzipped \ @@ -347,9 +356,6 @@ EXTRA_DIST += \ tests/no_case_size.sav \ tests/coverage.sh tests/test_template \ tests/v13.sav tests/v14.sav \ - tests/bugs/computebug.stat tests/bugs/computebug.out \ - tests/bugs/recode-copy-bug-1.stat tests/bugs/recode-copy-bug-2.stat \ - tests/bugs/recode-copy-bug-1.out tests/bugs/recode-copy-bug-2.out \ tests/expressions/randist/beta.out \ tests/expressions/randist/cauchy.out \ tests/expressions/randist/chisq.out \ @@ -389,3 +395,45 @@ check-for-export-var-val: DIST_HOOKS += check-for-export-var-val EXTRA_DIST += tests/OChangeLog + +# Autotest testsuite + +EXTRA_DIST += \ + $(TESTSUITE_AT) \ + $(TESTSUITE) \ + tests/atlocal.in \ + $(srcdir)/package.m4 \ + $(TESTSUITE) +TESTSUITE_AT = \ + tests/testsuite.at \ + tests/language/stats/crosstabs.at \ + tests/language/stats/frequencies.at \ + tests/output/render.at +TESTSUITE = $(srcdir)/tests/testsuite +DISTCLEANFILES += tests/atconfig tests/atlocal $(TESTSUITE) + +CHECK_LOCAL += tests_check +tests_check: tests/atconfig tests/atlocal $(TESTSUITE) + $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=tests/output:src/ui/terminal $(TESTSUITEFLAGS) + +CLEAN_LOCAL += tests_clean +tests_clean: + test ! -f '$(TESTSUITE)' || $(SHELL) '$(TESTSUITE)' -C tests --clean + +AUTOM4TE = $(SHELL) $(srcdir)/missing --run autom4te +AUTOTEST = $(AUTOM4TE) --language=autotest +$(TESTSUITE): package.m4 $(TESTSUITE_AT) + $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at + mv $@.tmp $@ + +# The `:;' works around a Bash 3.2 bug when the output is not writeable. +$(srcdir)/package.m4: $(top_srcdir)/configure.ac + :;{ \ + echo '# Signature of the current package.' && \ + echo 'm4_define([AT_PACKAGE_NAME], [$(PACKAGE_NAME)])' && \ + echo 'm4_define([AT_PACKAGE_TARNAME], [$(PACKAGE_TARNAME)])' && \ + echo 'm4_define([AT_PACKAGE_VERSION], [$(PACKAGE_VERSION)])' && \ + echo 'm4_define([AT_PACKAGE_STRING], [$(PACKAGE_STRING)])' && \ + echo 'm4_define([AT_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])' && \ + echo 'm4_define([AT_PACKAGE_URL], [$(PACKAGE_URL)])'; \ + } >'$(srcdir)/package.m4'