X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=39b16d909007a3d150a266a5e21f1bc4bdeeecb8;hb=3384b8f946b446e849bad1bc7aad238b2e0a9691;hp=9e6b90f05a85ebd89371d4e6c05dcaaf65b16132;hpb=c83f5c5360ea8b67ae4fd81c35ae606724aa0da9;p=pspp

diff --git a/tests/automake.mk b/tests/automake.mk
index 9e6b90f05a..39b16d9090 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,28 +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 \
-	tests/command/match-files.sh \
 	tests/command/missing-values.sh \
 	tests/command/no_case_size.sh \
 	tests/command/n_of_cases.sh \
@@ -97,20 +75,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 \
@@ -137,17 +105,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/tower-test
-
 TESTS = $(dist_TESTS) $(nodist_TESTS)
 
 check_PROGRAMS += \
@@ -171,6 +128,7 @@ check_PROGRAMS += \
 	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,8 +300,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/weighting.data tests/data-list.data \
 	tests/no_case_size.sav \
 	tests/coverage.sh tests/test_template \
 	tests/v13.sav tests/v14.sav \
@@ -373,7 +330,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 +348,7 @@ EXTRA_DIST += tests/OChangeLog
 # Autotest testsuite
 
 EXTRA_DIST += \
+	tests/testsuite.in \
 	$(TESTSUITE_AT) \
 	$(TESTSUITE) \
 	tests/atlocal.in \
@@ -398,26 +357,43 @@ 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/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/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/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/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 \
@@ -434,6 +410,7 @@ TESTSUITE_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 \