tests: Convert do-repeat.sh test to use Autotest.

[pspp] / tests / automake.mk

diff --git a/tests/automake.mk b/tests/automake.mk
index 83bbeeb343f683e517f426803b7dcdab5e9aa1c3..a873a7265dcdbd334b8fe62bc7db697825b93269 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -10,10 +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 \
@@ -97,7 +93,6 @@ 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 \
@@ -145,32 +140,30 @@ if PSQL_SUPPORT
 dist_TESTS += tests/command/get-data-psql.sh 
 endif
 
-nodist_TESTS = \
+TESTS = $(dist_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/i18n-test \
-       tests/libpspp/sparse-xarray-test \
+       tests/libpspp/tower-test \
        tests/output/render-test
 
 tests_data_datasheet_test_SOURCES = \
@@ -398,6 +391,9 @@ EXTRA_DIST += \
 
 TESTSUITE_AT = \
        tests/data/calendar.at \
+       tests/data/data-in.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 \
@@ -408,6 +404,7 @@ 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/factor.at \
@@ -418,7 +415,23 @@ TESTSUITE_AT = \
        tests/language/xforms/compute.at \
        tests/language/xforms/count.at \
        tests/language/xforms/recode.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 \
@@ -435,7 +448,7 @@ $(srcdir)/tests/testsuite.at: tests/testsuite.in Makefile
 
 
 CHECK_LOCAL += tests_check
-tests_check: tests/atconfig tests/atlocal $(TESTSUITE)
+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