X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=30c3138dc4f8dd9b8b7765fab57092825a0fa645;hb=151339dd4b016e0e98c153f51d7983477255498b;hp=53dcdf0acc0129cf9bba0268cc3c31e3614baa74;hpb=fc4cd1371a6aa4b74901998c046f76801b5a85b1;p=pspp-builds.git

diff --git a/tests/automake.mk b/tests/automake.mk
index 53dcdf0a..30c3138d 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -10,20 +10,6 @@ TESTS_ENVIRONMENT += LC_ALL=C
 TESTS_ENVIRONMENT += EXEEXT=$(EXEEXT)
 
 dist_TESTS = \
-	tests/formats/date-in.sh \
-	tests/formats/date-out.sh \
-	tests/formats/float-format.sh \
-	tests/formats/format-guesser.sh \
-	tests/formats/ib-in.sh \
-	tests/formats/legacy-in.sh \
-	tests/formats/month-in.sh \
-	tests/formats/month-out.sh \
-	tests/formats/num-in.sh \
-	tests/formats/num-out.sh \
-	tests/formats/time-in.sh \
-	tests/formats/time-out.sh \
-	tests/formats/wkday-in.sh \
-	tests/formats/wkday-out.sh \
 	tests/formats/360.sh
 
 TESTS = $(dist_TESTS) $(nodist_TESTS)
@@ -31,7 +17,7 @@ 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 \
@@ -200,7 +186,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 = \
@@ -223,17 +209,14 @@ EXTRA_DIST += \
 	$(dist_TESTS) \
 	tests/coverage.sh tests/test_template \
 	tests/data/bcd-in.expected.cmp.gz \
+	tests/data/binhex-in.expected.cmp.gz \
+	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/binhex-out.expected.gz \
-	tests/formats/ib-in.expected.cmp.gz \
-	tests/formats/legacy-in.expected.cmp.gz \
-	tests/formats/num-in.expected.gz \
-	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*
@@ -263,6 +246,7 @@ TESTSUITE_AT = \
 	tests/data/data-in.at \
 	tests/data/data-out.at \
 	tests/data/datasheet-test.at \
+	tests/data/format-guesser.at \
 	tests/data/por-file.at \
 	tests/data/sys-file.at \
 	tests/language/command.at \
@@ -329,6 +313,7 @@ TESTSUITE_AT = \
 	tests/language/xforms/select-if.at \
 	tests/libpspp/abt.at \
 	tests/libpspp/bt.at \
+	tests/libpspp/float-format.at \
 	tests/libpspp/heap.at \
 	tests/libpspp/hmap.at \
 	tests/libpspp/hmapx.at \