X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=30c3138dc4f8dd9b8b7765fab57092825a0fa645;hb=151339dd4b016e0e98c153f51d7983477255498b;hp=e14cd23de5804207985defc382a3c2956e6fc7c6;hpb=a387b15e7810da1748df16717c1d761f42d640ff;p=pspp-builds.git diff --git a/tests/automake.mk b/tests/automake.mk index e14cd23d..30c3138d 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -10,49 +10,14 @@ TESTS_ENVIRONMENT += LC_ALL=C TESTS_ENVIRONMENT += EXEEXT=$(EXEEXT) dist_TESTS = \ - tests/formats/bcd-in.sh \ - tests/formats/binhex-out.sh \ - tests/formats/date-in.sh \ - tests/formats/date-out.sh \ - tests/formats/float-format.sh \ - tests/formats/format-guesser.sh \ - tests/formats/ib-in.sh \ - tests/formats/legacy-in.sh \ - tests/formats/month-in.sh \ - tests/formats/month-out.sh \ - tests/formats/num-in.sh \ - tests/formats/num-out.sh \ - tests/formats/time-in.sh \ - tests/formats/time-out.sh \ - tests/formats/wkday-in.sh \ - tests/formats/wkday-out.sh \ - tests/formats/360.sh \ - tests/bugs/curtailed.sh \ - tests/bugs/if_crash.sh \ - tests/bugs/multipass.sh \ - tests/bugs/overwrite-input-file.sh \ - tests/bugs/overwrite-special-file.sh \ - tests/bugs/shbang.sh \ - tests/bugs/signals.sh \ - tests/bugs/temporary.sh \ - tests/bugs/unwritable-dir.sh \ - tests/bugs/val-labs.sh \ - tests/bugs/val-labs-trailing-slash.sh \ - tests/bugs/keep-all.sh \ - tests/data/datasheet-test.sh \ - tests/libpspp/sparse-xarray-test.sh \ - tests/output/paper-size.sh \ - tests/expressions/randist.sh \ - tests/expressions/valuelabel.sh \ - tests/expressions/variables.sh \ - tests/expressions/vectors.sh + tests/formats/360.sh TESTS = $(dist_TESTS) $(nodist_TESTS) check_PROGRAMS += \ $(nodist_TESTS) \ tests/data/datasheet-test \ - tests/formats/inexactify \ + tests/data/inexactify \ tests/libpspp/abt-test \ tests/libpspp/bt-test \ tests/libpspp/heap-test \ @@ -221,7 +186,7 @@ tests_libpspp_sparse_xarray_test_SOURCES = \ tests_libpspp_sparse_xarray_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_sparse_xarray_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 -tests_formats_inexactify_SOURCES = tests/formats/inexactify.c +tests_data_inexactify_SOURCES = tests/data/inexactify.c noinst_PROGRAMS += tests/dissect-sysfile tests_dissect_sysfile_SOURCES = \ @@ -243,34 +208,15 @@ tests_output_render_test_LDADD = \ EXTRA_DIST += \ $(dist_TESTS) \ tests/coverage.sh tests/test_template \ - tests/data/v13.sav tests/data/v14.sav \ - tests/expressions/randist/beta.out \ - tests/expressions/randist/cauchy.out \ - tests/expressions/randist/chisq.out \ - tests/expressions/randist/exp.out \ - tests/expressions/randist/f.out \ - tests/expressions/randist/gamma.out \ - tests/expressions/randist/laplace.out \ - tests/expressions/randist/lnormal.out \ - tests/expressions/randist/logistic.out \ - tests/expressions/randist/normal.out \ - tests/expressions/randist/pareto.out \ - tests/expressions/randist/compare.pl \ - tests/expressions/randist/randist.pl \ - tests/expressions/randist/randist.txt \ - tests/expressions/randist/t.out \ - tests/expressions/randist/uniform.out \ - tests/expressions/randist/weibull.out \ - tests/formats/bcd-in.expected.cmp.gz \ - tests/formats/binhex-out.expected.gz \ - tests/formats/ib-in.expected.cmp.gz \ - tests/formats/legacy-in.expected.cmp.gz \ - tests/formats/num-in.expected.gz \ - tests/formats/num-out.expected.cmp.gz \ - tests/formats/num-out-cmp.pl \ - tests/formats/num-out-compare.pl \ - tests/formats/num-out-decmp.pl \ - tests/formats/num-out.pl \ + tests/data/bcd-in.expected.cmp.gz \ + tests/data/binhex-in.expected.cmp.gz \ + tests/data/binhex-out.expected.gz \ + 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 CLEANFILES += *.save pspp.* foo* @@ -298,11 +244,16 @@ EXTRA_DIST += \ TESTSUITE_AT = \ tests/data/calendar.at \ tests/data/data-in.at \ + tests/data/data-out.at \ + tests/data/datasheet-test.at \ + tests/data/format-guesser.at \ + tests/data/por-file.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/control/temporary.at \ tests/language/data-io/add-files.at \ tests/language/data-io/data-list.at \ tests/language/data-io/data-reader.at \ @@ -324,10 +275,14 @@ TESTSUITE_AT = \ tests/language/dictionary/rename-variables.at \ tests/language/dictionary/split-file.at \ tests/language/dictionary/sys-file-info.at \ + tests/language/dictionary/value-labels.at \ tests/language/dictionary/variable-display.at \ tests/language/dictionary/vector.at \ tests/language/dictionary/weight.at \ tests/language/expressions/evaluate.at \ + tests/language/expressions/parse.at \ + tests/language/lexer/lexer.at \ + tests/language/lexer/q2c.at \ tests/language/lexer/variable-parser.at \ tests/language/stats/aggregate.at \ tests/language/stats/autorecode.at \ @@ -358,6 +313,7 @@ TESTSUITE_AT = \ tests/language/xforms/select-if.at \ tests/libpspp/abt.at \ tests/libpspp/bt.at \ + tests/libpspp/float-format.at \ tests/libpspp/heap.at \ tests/libpspp/hmap.at \ tests/libpspp/hmapx.at \ @@ -367,6 +323,7 @@ TESTSUITE_AT = \ tests/libpspp/range-map.at \ tests/libpspp/range-set.at \ tests/libpspp/sparse-array.at \ + tests/libpspp/sparse-xarray-test.at \ tests/libpspp/str.at \ tests/libpspp/string-map.at \ tests/libpspp/stringi-map.at \ @@ -374,8 +331,11 @@ TESTSUITE_AT = \ tests/libpspp/stringi-set.at \ tests/libpspp/tower.at \ tests/math/moments.at \ - tests/output/render.at \ + tests/math/randist.at \ tests/output/charts.at \ + tests/output/output.at \ + tests/output/paper-size.at \ + tests/output/render.at \ tests/ui/terminal/main.at \ tests/perl-module.at @@ -391,7 +351,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/libpspp:tests/output:src/ui/terminal $(TESTSUITEFLAGS) + $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=tests/data:tests/libpspp:tests/output:src/ui/terminal $(TESTSUITEFLAGS) CLEAN_LOCAL += tests_clean tests_clean: