ll: Convert tests to use Autotest.

[pspp] / tests / automake.mk

diff --git a/tests/automake.mk b/tests/automake.mk
index 83bbeeb343f683e517f426803b7dcdab5e9aa1c3..127bbdb9cae576ef3953508b803d5d856d2d88b2 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -146,12 +146,6 @@ dist_TESTS += tests/command/get-data-psql.sh
 endif
 
 nodist_TESTS = \
-       tests/libpspp/abt-test \
-       tests/libpspp/bt-test \
-       tests/libpspp/heap-test \
-       tests/libpspp/hmap-test \
-       tests/libpspp/hmapx-test \
-       tests/libpspp/ll-test \
        tests/libpspp/llx-test \
        tests/libpspp/range-map-test \
        tests/libpspp/range-set-test \
@@ -169,7 +163,13 @@ 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/sparse-xarray-test \
        tests/output/render-test
 
@@ -418,7 +418,13 @@ 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/math/moments.at \
        tests/output/render.at \
        tests/output/charts.at \
@@ -435,7 +441,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