X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=19a2798ea86e5aaada24e223e322e32ffb4035f1;hb=889ab43a7bce4a4dc6e76e1ed1216deaa6770498;hp=beb9acb05702409e5a5e07882b44afd92fd52ef6;hpb=41ba7141cfc3af541ef00ecc0d4c1325f7579c0f;p=pspp diff --git a/tests/automake.mk b/tests/automake.mk index beb9acb057..19a2798ea8 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -7,32 +7,9 @@ TESTS_ENVIRONMENT += PERL='$(PERL)' PG_CONFIG='$(PG_CONFIG)' TESTS_ENVIRONMENT += CHARSETALIASDIR='$(abs_top_builddir)/gl' TESTS_ENVIRONMENT += LC_ALL=C +TESTS_ENVIRONMENT += EXEEXT=$(EXEEXT) dist_TESTS = \ - tests/command/add-files.sh \ - tests/command/attributes.sh \ - tests/command/beg-data.sh \ - tests/command/bignum.sh \ - tests/command/count.sh \ - tests/command/correlation.sh \ - tests/command/data-list.sh \ - tests/command/do-if.sh \ - tests/command/do-repeat.sh \ - tests/command/erase.sh \ - tests/command/examine.sh \ - tests/command/examine-extremes.sh \ - tests/command/examine-percentiles.sh \ - tests/command/file-label.sh \ - tests/command/file-handle.sh \ - tests/command/filter.sh \ - tests/command/flip.sh \ - tests/command/get-data-txt.sh \ - tests/command/get-data-txt-examples.sh \ - tests/command/get-data-txt-importcases.sh \ - tests/command/import-export.sh \ - tests/command/insert.sh \ - tests/command/lag.sh \ - tests/command/line-ends.sh \ tests/command/list.sh \ tests/command/loop.sh \ tests/command/longvars.sh \ @@ -44,9 +21,6 @@ dist_TESTS = \ tests/command/npar-chisquare.sh \ tests/command/npar-wilcoxon.sh \ tests/command/npar-sign.sh \ - tests/command/oneway.sh \ - tests/command/oneway-missing.sh \ - tests/command/oneway-with-splits.sh \ tests/command/permissions.sh \ tests/command/print.sh \ tests/command/print-strings.sh \ @@ -105,18 +79,10 @@ dist_TESTS = \ tests/bugs/compression.sh \ tests/bugs/curtailed.sh \ tests/bugs/data-crash.sh \ - tests/bugs/empty-do-repeat.sh \ tests/bugs/get.sh \ - tests/bugs/examine-crash.sh \ - tests/bugs/examine-crash2.sh \ - tests/bugs/examine-crash3.sh \ - tests/bugs/examine-1sample.sh \ - tests/bugs/examine-missing.sh \ - tests/bugs/examine-missing2.sh \ tests/bugs/get-no-file.sh \ tests/bugs/if_crash.sh \ tests/bugs/input-crash.sh \ - tests/bugs/lag_crash.sh \ tests/bugs/list-overflow.sh \ tests/bugs/match-files-scratch.sh \ tests/bugs/multipass.sh \ @@ -140,124 +106,103 @@ dist_TESTS = \ tests/data/datasheet-test.sh \ tests/libpspp/sparse-xarray-test.sh \ tests/output/paper-size.sh \ - tests/stats/moments.sh \ - tests/expressions/expressions.sh \ - tests/expressions/epoch.sh \ tests/expressions/randist.sh \ tests/expressions/valuelabel.sh \ tests/expressions/variables.sh \ tests/expressions/vectors.sh -if GNM_SUPPORT -dist_TESTS += tests/command/get-data-gnm.sh -endif - -if PSQL_SUPPORT -dist_TESTS += tests/command/get-data-psql.sh -endif +TESTS = $(dist_TESTS) $(nodist_TESTS) -nodist_TESTS = \ +check_PROGRAMS += \ + $(nodist_TESTS) \ + tests/data/datasheet-test \ + tests/formats/inexactify \ tests/libpspp/abt-test \ tests/libpspp/bt-test \ tests/libpspp/heap-test \ tests/libpspp/hmap-test \ tests/libpspp/hmapx-test \ + tests/libpspp/i18n-test \ tests/libpspp/ll-test \ tests/libpspp/llx-test \ tests/libpspp/range-map-test \ tests/libpspp/range-set-test \ tests/libpspp/sparse-array-test \ + tests/libpspp/sparse-xarray-test \ tests/libpspp/str-test \ tests/libpspp/string-map-test \ + tests/libpspp/stringi-map-test \ tests/libpspp/string-set-test \ tests/libpspp/stringi-set-test \ - tests/libpspp/tower-test - -TESTS = $(dist_TESTS) $(nodist_TESTS) - -check_PROGRAMS += \ - $(nodist_TESTS) \ - tests/data/datasheet-test \ - tests/formats/inexactify \ - tests/libpspp/sparse-xarray-test \ + tests/libpspp/tower-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_LDADD = src/libpspp-core.la $(LIBINTL) tests_data_datasheet_test_CFLAGS = $(AM_CFLAGS) tests_libpspp_ll_test_SOURCES = \ src/libpspp/ll.c \ - src/libpspp/ll.h \ tests/libpspp/ll-test.c tests_libpspp_ll_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_ll_test_CFLAGS = $(AM_CFLAGS) tests_libpspp_llx_test_SOURCES = \ src/libpspp/ll.c \ - src/libpspp/ll.h \ src/libpspp/llx.c \ - src/libpspp/llx.h \ tests/libpspp/llx-test.c tests_libpspp_llx_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_llx_test_CFLAGS = $(AM_CFLAGS) tests_libpspp_heap_test_SOURCES = \ src/libpspp/heap.c \ - src/libpspp/heap.h \ src/libpspp/pool.c \ - src/libpspp/pool.h \ + src/libpspp/temp-file.c \ tests/libpspp/heap-test.c tests_libpspp_heap_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_heap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 tests_libpspp_hmap_test_SOURCES = \ src/libpspp/hmap.c \ - src/libpspp/hmap.h \ tests/libpspp/hmap-test.c tests_libpspp_hmap_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_hmap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 tests_libpspp_hmapx_test_SOURCES = \ src/libpspp/hmap.c \ - src/libpspp/hmap.h \ src/libpspp/hmapx.c \ - src/libpspp/hmapx.h \ tests/libpspp/hmapx-test.c tests_libpspp_hmapx_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_hmapx_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 +tests_libpspp_i18n_test_SOURCES = tests/libpspp/i18n-test.c +tests_libpspp_i18n_test_LDADD = src/libpspp/libpspp.la gl/libgl.la $(LIBINTL) + tests_libpspp_abt_test_SOURCES = \ src/libpspp/abt.c \ - src/libpspp/abt.h \ tests/libpspp/abt-test.c tests_libpspp_abt_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_abt_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 tests_libpspp_bt_test_SOURCES = \ src/libpspp/bt.c \ - src/libpspp/bt.h \ tests/libpspp/bt-test.c tests_libpspp_bt_test_LDADD = gl/libgl.la tests_libpspp_bt_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 tests_libpspp_range_map_test_SOURCES = \ src/libpspp/bt.c \ - src/libpspp/bt.h \ src/libpspp/range-map.c \ - src/libpspp/range-map.h \ tests/libpspp/range-map-test.c tests_libpspp_range_map_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_range_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 tests_libpspp_range_set_test_SOURCES = \ src/libpspp/bt.c \ - src/libpspp/bt.h \ src/libpspp/pool.c \ - src/libpspp/pool.h \ src/libpspp/range-set.c \ - src/libpspp/range-set.h \ + src/libpspp/temp-file.c \ tests/libpspp/range-set-test.c tests_libpspp_range_set_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_range_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 @@ -275,6 +220,19 @@ tests_libpspp_string_map_test_SOURCES = \ tests_libpspp_string_map_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_string_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 +tests_libpspp_stringi_map_test_SOURCES = \ + src/libpspp/hash-functions.c \ + src/libpspp/hmap.c \ + src/libpspp/pool.c \ + src/libpspp/str.c \ + src/libpspp/stringi-map.c \ + src/libpspp/string-set.c \ + src/libpspp/stringi-set.c \ + src/libpspp/temp-file.c \ + tests/libpspp/stringi-map-test.c +tests_libpspp_stringi_map_test_LDADD = gl/libgl.la $(LIBINTL) +tests_libpspp_stringi_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 + tests_libpspp_string_set_test_SOURCES = \ src/libpspp/hash-functions.c \ src/libpspp/hmap.c \ @@ -289,27 +247,25 @@ tests_libpspp_stringi_set_test_SOURCES = \ src/libpspp/pool.c \ src/libpspp/str.c \ src/libpspp/stringi-set.c \ + src/libpspp/temp-file.c \ tests/libpspp/stringi-set-test.c tests_libpspp_stringi_set_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_stringi_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 tests_libpspp_tower_test_SOURCES = \ src/libpspp/abt.c \ - src/libpspp/abt.h \ src/libpspp/pool.c \ - src/libpspp/pool.h \ + src/libpspp/temp-file.c \ src/libpspp/tower.c \ - src/libpspp/tower.h \ tests/libpspp/tower-test.c tests_libpspp_tower_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_tower_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 tests_libpspp_sparse_array_test_SOURCES = \ src/libpspp/sparse-array.c \ - src/libpspp/sparse-array.h \ src/libpspp/pool.c \ - src/libpspp/pool.h \ - tests/libpspp/sparse-array-test.c + tests/libpspp/sparse-array-test.c \ + src/libpspp/temp-file.c tests_libpspp_sparse_array_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_sparse_array_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 @@ -317,13 +273,14 @@ tests_libpspp_sparse_xarray_test_SOURCES = \ src/libpspp/argv-parser.c \ src/libpspp/bt.c \ src/libpspp/deque.c \ + src/libpspp/ext-array.c \ src/libpspp/model-checker.c \ src/libpspp/range-set.c \ src/libpspp/sparse-array.c \ src/libpspp/sparse-xarray.c \ src/libpspp/str.c \ src/libpspp/pool.c \ - src/libpspp/tmpfile.c \ + src/libpspp/temp-file.c \ tests/libpspp/sparse-xarray-test.c tests_libpspp_sparse_xarray_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_sparse_xarray_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 @@ -349,7 +306,6 @@ tests_output_render_test_LDADD = \ EXTRA_DIST += \ $(dist_TESTS) \ - tests/Book1.gnm.unzipped \ tests/weighting.data tests/data-list.data tests/list.data \ tests/no_case_size.sav \ tests/coverage.sh tests/test_template \ @@ -380,7 +336,8 @@ EXTRA_DIST += \ tests/formats/num-out-cmp.pl \ tests/formats/num-out-compare.pl \ tests/formats/num-out-decmp.pl \ - tests/formats/num-out.pl + tests/formats/num-out.pl \ + tests/language/data-io/Book1.gnm.unzipped CLEANFILES += *.save pspp.* foo* @@ -397,36 +354,91 @@ EXTRA_DIST += tests/OChangeLog # Autotest testsuite EXTRA_DIST += \ + tests/testsuite.in \ $(TESTSUITE_AT) \ $(TESTSUITE) \ tests/atlocal.in \ $(srcdir)/package.m4 \ $(TESTSUITE) + TESTSUITE_AT = \ - tests/testsuite.at \ + tests/data/calendar.at \ + tests/data/data-in.at \ + tests/language/command.at \ + tests/language/control/do-if.at \ + tests/language/control/do-repeat.at \ + tests/language/data-io/add-files.at \ + tests/language/data-io/data-list.at \ + tests/language/data-io/data-reader.at \ + tests/language/data-io/file-handle.at \ + tests/language/data-io/get-data-gnm.at \ + tests/language/data-io/get-data-psql.at \ + tests/language/data-io/get-data-txt.at \ + tests/language/data-io/save.at \ + tests/language/data-io/save-translate.at \ + tests/language/dictionary/attributes.at \ + tests/language/dictionary/mrsets.at \ + tests/language/expressions/evaluate.at \ tests/language/stats/aggregate.at \ tests/language/stats/autorecode.at \ + tests/language/stats/correlations.at \ tests/language/stats/crosstabs.at \ tests/language/stats/descriptives.at \ + tests/language/stats/examine.at \ + tests/language/stats/factor.at \ + tests/language/stats/flip.at \ tests/language/stats/frequencies.at \ + tests/language/stats/oneway.at \ + tests/language/utilities/insert.at \ + tests/language/utilities/set.at \ + tests/language/utilities/title.at \ tests/language/xforms/compute.at \ + tests/language/xforms/count.at \ tests/language/xforms/recode.at \ + tests/language/xforms/select-if.at \ + tests/libpspp/abt.at \ + tests/libpspp/bt.at \ + tests/libpspp/heap.at \ + tests/libpspp/hmap.at \ + tests/libpspp/hmapx.at \ + tests/libpspp/i18n.at \ + tests/libpspp/ll.at \ + tests/libpspp/llx.at \ + tests/libpspp/range-map.at \ + tests/libpspp/range-set.at \ + tests/libpspp/sparse-array.at \ + tests/libpspp/str.at \ + tests/libpspp/string-map.at \ + tests/libpspp/stringi-map.at \ + tests/libpspp/string-set.at \ + tests/libpspp/stringi-set.at \ + tests/libpspp/tower.at \ + tests/math/moments.at \ tests/output/render.at \ + tests/output/charts.at \ tests/perl-module.at + TESTSUITE = $(srcdir)/tests/testsuite DISTCLEANFILES += tests/atconfig tests/atlocal $(TESTSUITE) +$(srcdir)/tests/testsuite.at: tests/testsuite.in Makefile + cp $< $@ + for t in $(TESTSUITE_AT); do \ + echo "m4_include([$$t])" >> $@ ;\ + done + + CHECK_LOCAL += tests_check -tests_check: tests/atconfig tests/atlocal $(TESTSUITE) - $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=tests/output:src/ui/terminal $(TESTSUITEFLAGS) +tests_check: tests/atconfig tests/atlocal $(TESTSUITE) $(check_PROGRAMS) + $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=tests/libpspp: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 +AUTOM4TE = $(SHELL) $(srcdir)/build-aux/missing --run autom4te AUTOTEST = $(AUTOM4TE) --language=autotest -$(TESTSUITE): package.m4 $(TESTSUITE_AT) +$(TESTSUITE): package.m4 $(srcdir)/tests/testsuite.at $(TESTSUITE_AT) $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at mv $@.tmp $@