X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=19a2798ea86e5aaada24e223e322e32ffb4035f1;hb=889ab43a7bce4a4dc6e76e1ed1216deaa6770498;hp=127bbdb9cae576ef3953508b803d5d856d2d88b2;hpb=02cf2508dcb1cc54d2e79835212459fffb4ab2e3;p=pspp

diff --git a/tests/automake.mk b/tests/automake.mk
index 127bbdb9ca..19a2798ea8 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -10,24 +10,6 @@ TESTS_ENVIRONMENT += LC_ALL=C
 TESTS_ENVIRONMENT += EXEEXT=$(EXEEXT)
 
 dist_TESTS = \
-	tests/command/bignum.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 \
@@ -97,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 \
@@ -137,26 +111,6 @@ 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
-
-nodist_TESTS = \
-	tests/libpspp/llx-test \
-	tests/libpspp/range-map-test \
-	tests/libpspp/range-set-test \
-	tests/libpspp/sparse-array-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 += \
@@ -170,7 +124,17 @@ check_PROGRAMS += \
 	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/output/render-test
 
 tests_data_datasheet_test_SOURCES = \
@@ -342,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 \
@@ -373,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*
 
@@ -390,6 +354,7 @@ EXTRA_DIST += tests/OChangeLog
 # Autotest testsuite
 
 EXTRA_DIST += \
+	tests/testsuite.in \
 	$(TESTSUITE_AT) \
 	$(TESTSUITE) \
 	tests/atlocal.in \
@@ -398,9 +363,17 @@ EXTRA_DIST += \
 
 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 \
@@ -408,16 +381,21 @@ TESTSUITE_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 \
@@ -425,6 +403,16 @@ TESTSUITE_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 \