X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=8be58e18f55fed21792b3861668de8d110f0162c;hb=714ea20439a47287d31820eb71ef77e01a465d86;hp=fc58b3cb7b515ba9ac3f49d00fdb2938ba30f51c;hpb=018f395e7f37c988d812bdf408c2c84e55ed8678;p=pspp-builds.git

diff --git a/tests/automake.mk b/tests/automake.mk
index fc58b3cb..8be58e18 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -1,25 +1,8 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-TESTS_ENVIRONMENT = top_srcdir='$(top_srcdir)' top_builddir='$(top_builddir)'
-TESTS_ENVIRONMENT += PERL='$(PERL)'
-
-# Allow locale_charset to find charset.alias before running "make install".
-TESTS_ENVIRONMENT += CHARSETALIASDIR='$(abs_top_builddir)/gl'
-
-TESTS_ENVIRONMENT += LC_ALL=C
-TESTS_ENVIRONMENT += EXEEXT=$(EXEEXT)
-
-dist_TESTS = \
-	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 \
@@ -188,7 +171,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 = \
@@ -208,32 +191,20 @@ tests_output_render_test_LDADD = \
 	$(LIBINTL)
 
 EXTRA_DIST += \
-	$(dist_TESTS) \
-	tests/coverage.sh tests/test_template \
+	tests/coverage.sh \
 	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/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*
 
-check-for-export-var-val:
-	@if grep -q 'export .*=' $(dist_TESTS) ; then \
-	 echo 'One or more tests contain non-portable "export VAR=val" syntax' ; \
-	 false ; \
-	fi
-
-DIST_HOOKS += check-for-export-var-val
-
 EXTRA_DIST += tests/OChangeLog
 
 # Autotest testsuite
@@ -306,6 +277,7 @@ TESTSUITE_AT = \
 	tests/language/stats/roc.at \
 	tests/language/stats/sort-cases.at \
 	tests/language/stats/t-test.at \
+	tests/language/utilities/cache.at \
 	tests/language/utilities/date.at \
 	tests/language/utilities/insert.at \
 	tests/language/utilities/permissions.at \