X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=fc58b3cb7b515ba9ac3f49d00fdb2938ba30f51c;hb=018f395e7f37c988d812bdf408c2c84e55ed8678;hp=3a0e5c05e6ae9c4c3b12482ffbc510a6fc3c16f3;hpb=43bbe3ba14482dce65459f02e18e16ff718afd44;p=pspp-builds.git

diff --git a/tests/automake.mk b/tests/automake.mk
index 3a0e5c05..fc58b3cb 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -10,39 +10,9 @@ 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/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)
 
@@ -240,29 +210,13 @@ 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/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/v13.sav \
+	tests/data/v14.sav \
 	tests/formats/num-out.expected.cmp.gz \
 	tests/formats/num-out-cmp.pl \
 	tests/formats/num-out-compare.pl \
@@ -295,11 +249,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 \
@@ -321,11 +280,13 @@ 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 \
@@ -357,6 +318,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 \
@@ -366,6 +328,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 \
@@ -373,8 +336,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
 
@@ -390,7 +356,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: