tests: Convert tests for binary and 360 data I/O to Autotest framework.

[pspp-builds.git] / tests / automake.mk

diff --git a/tests/automake.mk b/tests/automake.mk
index 031c39abe853a40101d5085407ce2a7fa07e5988..95bc1765616eb87165960d0c86e6d3086228365f 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -9,18 +9,12 @@ TESTS_ENVIRONMENT += CHARSETALIASDIR='$(abs_top_builddir)/gl'
 TESTS_ENVIRONMENT += LC_ALL=C
 TESTS_ENVIRONMENT += EXEEXT=$(EXEEXT)
 
-dist_TESTS = \
-       tests/formats/date-in.sh \
-       tests/formats/num-out.sh \
-       tests/formats/time-in.sh \
-       tests/formats/360.sh
-
 TESTS = $(dist_TESTS) $(nodist_TESTS)
 
 check_PROGRAMS += \
        $(nodist_TESTS) \
        tests/data/datasheet-test \
-       tests/formats/inexactify \
+       tests/data/inexactify \
        tests/libpspp/abt-test \
        tests/libpspp/bt-test \
        tests/libpspp/heap-test \
@@ -189,7 +183,7 @@ tests_libpspp_sparse_xarray_test_SOURCES = \
 tests_libpspp_sparse_xarray_test_LDADD = gl/libgl.la $(LIBINTL) 
 tests_libpspp_sparse_xarray_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
-tests_formats_inexactify_SOURCES = tests/formats/inexactify.c
+tests_data_inexactify_SOURCES = tests/data/inexactify.c
 
 noinst_PROGRAMS += tests/dissect-sysfile
 tests_dissect_sysfile_SOURCES = \
@@ -216,13 +210,10 @@ EXTRA_DIST += \
        tests/data/binhex-out.expected.gz \
        tests/data/legacy-in.expected.cmp.gz \
        tests/data/num-in.expected.gz \
+       tests/data/num-out-cmp.pl \
+       tests/data/num-out.expected.cmp.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 \
-       tests/formats/num-out-decmp.pl \
-       tests/formats/num-out.pl \
         tests/language/data-io/Book1.gnm.unzipped
 
 CLEANFILES += *.save pspp.* foo*