X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=0c3296e847c893808f30f06b2983f7b11758de4b;hb=6674515fd416ff3df1e0bd0ad46cfed30636476d;hp=6b523ce8b4e91b922d1de6ccbc8abfcc1977feec;hpb=fcb75da3200f19842a2eb12ca00063a727a226fd;p=pspp-builds.git diff --git a/tests/automake.mk b/tests/automake.mk index 6b523ce8..0c3296e8 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in -*- makefile -*- TESTS_ENVIRONMENT = top_srcdir='$(top_srcdir)' top_builddir='$(top_builddir)' -TESTS_ENVIRONMENT += PERL='$(PERL)' PG_CONFIG='$(PG_CONFIG)' +TESTS_ENVIRONMENT += PERL='$(PERL)' # Allow locale_charset to find charset.alias before running "make install". TESTS_ENVIRONMENT += CHARSETALIASDIR='$(abs_top_builddir)/gl' @@ -10,53 +10,6 @@ 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/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/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 \ - tests/command/match-files.sh \ - tests/command/missing-values.sh \ - tests/command/no_case_size.sh \ - tests/command/n_of_cases.sh \ - tests/command/npar-binomial.sh \ - tests/command/npar-chisquare.sh \ - tests/command/npar-wilcoxon.sh \ - tests/command/npar-sign.sh \ - tests/command/permissions.sh \ - tests/command/print.sh \ - tests/command/print-strings.sh \ - tests/command/rank.sh \ - tests/command/rename.sh \ - tests/command/regression.sh \ - tests/command/regression-qr.sh \ - tests/command/reliability.sh \ - tests/command/roc.sh \ - tests/command/roc2.sh \ - tests/command/sample.sh \ - tests/command/sort.sh \ - tests/command/sysfiles.sh \ - tests/command/sysfiles-old.sh \ tests/command/sysfile-info.sh \ tests/command/split-file.sh \ tests/command/t-test-1-indep-val.sh \ @@ -101,20 +54,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 \ tests/bugs/overwrite-input-file.sh \ tests/bugs/overwrite-special-file.sh \ @@ -131,7 +74,6 @@ dist_TESTS = \ tests/bugs/unwritable-dir.sh \ tests/bugs/val-labs.sh \ tests/bugs/val-labs-trailing-slash.sh \ - tests/bugs/print-crash.sh \ tests/bugs/keep-all.sh \ tests/data/datasheet-test.sh \ tests/libpspp/sparse-xarray-test.sh \ @@ -141,39 +83,30 @@ dist_TESTS = \ 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 = \ @@ -183,25 +116,20 @@ 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) @@ -209,50 +137,43 @@ 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) @@ -305,21 +226,16 @@ 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 \ src/libpspp/temp-file.c tests_libpspp_sparse_array_test_LDADD = gl/libgl.la $(LIBINTL) @@ -362,9 +278,7 @@ 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/weighting.data \ tests/coverage.sh tests/test_template \ tests/v13.sav tests/v14.sav \ tests/expressions/randist/beta.out \ @@ -393,7 +307,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* @@ -410,6 +325,7 @@ EXTRA_DIST += tests/OChangeLog # Autotest testsuite EXTRA_DIST += \ + tests/testsuite.in \ $(TESTSUITE_AT) \ $(TESTSUITE) \ tests/atlocal.in \ @@ -418,24 +334,76 @@ EXTRA_DIST += \ TESTSUITE_AT = \ tests/data/calendar.at \ + tests/data/data-in.at \ + tests/data/sys-file.at \ + tests/language/command.at \ + tests/language/control/do-if.at \ + tests/language/control/do-repeat.at \ + tests/language/control/loop.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/list.at \ + tests/language/data-io/match-files.at \ + tests/language/data-io/print.at \ tests/language/data-io/save.at \ tests/language/data-io/save-translate.at \ + tests/language/dictionary/attributes.at \ + tests/language/dictionary/missing-values.at \ tests/language/dictionary/mrsets.at \ + tests/language/dictionary/rename-variables.at \ tests/language/expressions/evaluate.at \ + tests/language/lexer/variable-parser.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/npar.at \ tests/language/stats/oneway.at \ + tests/language/stats/rank.at \ + tests/language/stats/regression.at \ + tests/language/stats/reliability.at \ + tests/language/stats/roc.at \ + tests/language/stats/sort-cases.at \ + tests/language/utilities/insert.at \ + tests/language/utilities/permissions.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/sample.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/ui/terminal/main.at \ tests/perl-module.at TESTSUITE = $(srcdir)/tests/testsuite @@ -449,8 +417,8 @@ $(srcdir)/tests/testsuite.at: tests/testsuite.in Makefile 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: