X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=f64a66913ec0ddd83039e2d8d373b9ccf45fc1a2;hb=add3ba666ddc4f88fbf0934184c82e35c0787795;hp=beb9acb05702409e5a5e07882b44afd92fd52ef6;hpb=41ba7141cfc3af541ef00ecc0d4c1325f7579c0f;p=pspp

diff --git a/tests/automake.mk b/tests/automake.mk
index beb9acb057..f64a66913e 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -7,15 +7,11 @@ TESTS_ENVIRONMENT += PERL='$(PERL)' PG_CONFIG='$(PG_CONFIG)'
 TESTS_ENVIRONMENT += CHARSETALIASDIR='$(abs_top_builddir)/gl'
 
 TESTS_ENVIRONMENT += LC_ALL=C
+TESTS_ENVIRONMENT += EXEEXT=$(EXEEXT)
 
 dist_TESTS = \
-	tests/command/add-files.sh \
-	tests/command/attributes.sh \
-	tests/command/beg-data.sh \
 	tests/command/bignum.sh \
-	tests/command/count.sh \
 	tests/command/correlation.sh \
-	tests/command/data-list.sh \
 	tests/command/do-if.sh \
 	tests/command/do-repeat.sh \
 	tests/command/erase.sh \
@@ -25,7 +21,6 @@ dist_TESTS = \
 	tests/command/file-label.sh \
 	tests/command/file-handle.sh \
 	tests/command/filter.sh \
-	tests/command/flip.sh \
 	tests/command/get-data-txt.sh \
 	tests/command/get-data-txt-examples.sh \
 	tests/command/get-data-txt-importcases.sh \
@@ -44,9 +39,6 @@ dist_TESTS = \
 	tests/command/npar-chisquare.sh \
 	tests/command/npar-wilcoxon.sh \
 	tests/command/npar-sign.sh \
-	tests/command/oneway.sh \
-	tests/command/oneway-missing.sh \
-	tests/command/oneway-with-splits.sh \
 	tests/command/permissions.sh \
 	tests/command/print.sh \
 	tests/command/print-strings.sh \
@@ -140,9 +132,6 @@ dist_TESTS = \
 	tests/data/datasheet-test.sh \
 	tests/libpspp/sparse-xarray-test.sh \
 	tests/output/paper-size.sh \
-	tests/stats/moments.sh \
-	tests/expressions/expressions.sh \
-	tests/expressions/epoch.sh \
 	tests/expressions/randist.sh \
 	tests/expressions/valuelabel.sh \
 	tests/expressions/variables.sh \
@@ -169,6 +158,7 @@ nodist_TESTS = \
 	tests/libpspp/sparse-array-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
@@ -184,7 +174,7 @@ check_PROGRAMS += \
 
 tests_data_datasheet_test_SOURCES = \
 	tests/data/datasheet-test.c
-tests_data_datasheet_test_LDADD = gl/libgl.la src/libpspp-core.la $(LIBINTL) 
+tests_data_datasheet_test_LDADD = src/libpspp-core.la $(LIBINTL) 
 tests_data_datasheet_test_CFLAGS = $(AM_CFLAGS)
 
 tests_libpspp_ll_test_SOURCES = \
@@ -208,6 +198,7 @@ tests_libpspp_heap_test_SOURCES = \
 	src/libpspp/heap.h \
 	src/libpspp/pool.c \
 	src/libpspp/pool.h \
+	src/libpspp/temp-file.c \
 	tests/libpspp/heap-test.c
 tests_libpspp_heap_test_LDADD = gl/libgl.la $(LIBINTL) 
 tests_libpspp_heap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
@@ -258,6 +249,7 @@ tests_libpspp_range_set_test_SOURCES = \
 	src/libpspp/pool.h \
 	src/libpspp/range-set.c \
 	src/libpspp/range-set.h \
+	src/libpspp/temp-file.c \
 	tests/libpspp/range-set-test.c
 tests_libpspp_range_set_test_LDADD = gl/libgl.la $(LIBINTL) 
 tests_libpspp_range_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
@@ -275,6 +267,19 @@ tests_libpspp_string_map_test_SOURCES = \
 tests_libpspp_string_map_test_LDADD = gl/libgl.la $(LIBINTL)
 tests_libpspp_string_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
+tests_libpspp_stringi_map_test_SOURCES = \
+	src/libpspp/hash-functions.c \
+	src/libpspp/hmap.c \
+	src/libpspp/pool.c \
+	src/libpspp/str.c \
+	src/libpspp/stringi-map.c \
+	src/libpspp/string-set.c \
+	src/libpspp/stringi-set.c \
+	src/libpspp/temp-file.c \
+	tests/libpspp/stringi-map-test.c
+tests_libpspp_stringi_map_test_LDADD = gl/libgl.la $(LIBINTL)
+tests_libpspp_stringi_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+
 tests_libpspp_string_set_test_SOURCES = \
 	src/libpspp/hash-functions.c \
 	src/libpspp/hmap.c \
@@ -289,6 +294,7 @@ tests_libpspp_stringi_set_test_SOURCES = \
 	src/libpspp/pool.c \
 	src/libpspp/str.c \
 	src/libpspp/stringi-set.c \
+	src/libpspp/temp-file.c \
 	tests/libpspp/stringi-set-test.c
 tests_libpspp_stringi_set_test_LDADD = gl/libgl.la $(LIBINTL)
 tests_libpspp_stringi_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
@@ -298,6 +304,7 @@ tests_libpspp_tower_test_SOURCES = \
 	src/libpspp/abt.h \
 	src/libpspp/pool.c \
 	src/libpspp/pool.h \
+	src/libpspp/temp-file.c \
 	src/libpspp/tower.c \
 	src/libpspp/tower.h \
 	tests/libpspp/tower-test.c
@@ -309,7 +316,8 @@ tests_libpspp_sparse_array_test_SOURCES = \
 	src/libpspp/sparse-array.h \
 	src/libpspp/pool.c \
 	src/libpspp/pool.h \
-	tests/libpspp/sparse-array-test.c
+	tests/libpspp/sparse-array-test.c \
+	src/libpspp/temp-file.c
 tests_libpspp_sparse_array_test_LDADD = gl/libgl.la $(LIBINTL) 
 tests_libpspp_sparse_array_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
@@ -317,13 +325,14 @@ tests_libpspp_sparse_xarray_test_SOURCES = \
 	src/libpspp/argv-parser.c \
 	src/libpspp/bt.c \
 	src/libpspp/deque.c \
+	src/libpspp/ext-array.c \
 	src/libpspp/model-checker.c \
 	src/libpspp/range-set.c \
 	src/libpspp/sparse-array.c \
 	src/libpspp/sparse-xarray.c \
 	src/libpspp/str.c \
 	src/libpspp/pool.c \
-	src/libpspp/tmpfile.c \
+	src/libpspp/temp-file.c \
 	tests/libpspp/sparse-xarray-test.c
 tests_libpspp_sparse_xarray_test_LDADD = gl/libgl.la $(LIBINTL) 
 tests_libpspp_sparse_xarray_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
@@ -402,20 +411,44 @@ EXTRA_DIST += \
 	tests/atlocal.in \
 	$(srcdir)/package.m4 \
 	$(TESTSUITE)
+
 TESTSUITE_AT = \
-	tests/testsuite.at \
+	tests/data/calendar.at \
+	tests/language/data-io/add-files.at \
+	tests/language/data-io/data-list.at \
+	tests/language/data-io/data-reader.at \
+	tests/language/data-io/save.at \
+	tests/language/data-io/save-translate.at \
+	tests/language/dictionary/attributes.at \
+	tests/language/dictionary/mrsets.at \
+	tests/language/expressions/evaluate.at \
 	tests/language/stats/aggregate.at \
 	tests/language/stats/autorecode.at \
 	tests/language/stats/crosstabs.at \
 	tests/language/stats/descriptives.at \
+	tests/language/stats/factor.at \
+	tests/language/stats/flip.at \
 	tests/language/stats/frequencies.at \
+	tests/language/stats/oneway.at \
+	tests/language/utilities/set.at \
 	tests/language/xforms/compute.at \
+	tests/language/xforms/count.at \
 	tests/language/xforms/recode.at \
+	tests/math/moments.at \
 	tests/output/render.at \
+	tests/output/charts.at \
 	tests/perl-module.at
+
 TESTSUITE = $(srcdir)/tests/testsuite
 DISTCLEANFILES += tests/atconfig tests/atlocal $(TESTSUITE)
 
+$(srcdir)/tests/testsuite.at: tests/testsuite.in Makefile
+	cp $< $@
+	for t in $(TESTSUITE_AT); do \
+	  echo "m4_include([$$t])" >> $@ ;\
+	done
+
+
 CHECK_LOCAL += tests_check
 tests_check: tests/atconfig tests/atlocal $(TESTSUITE)
 	$(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=tests/output:src/ui/terminal $(TESTSUITEFLAGS)
@@ -424,9 +457,9 @@ CLEAN_LOCAL += tests_clean
 tests_clean:
 	test ! -f '$(TESTSUITE)' || $(SHELL) '$(TESTSUITE)' -C tests --clean
 
-AUTOM4TE = $(SHELL) $(srcdir)/missing --run autom4te
+AUTOM4TE = $(SHELL) $(srcdir)/build-aux/missing --run autom4te
 AUTOTEST = $(AUTOM4TE) --language=autotest
-$(TESTSUITE): package.m4 $(TESTSUITE_AT)
+$(TESTSUITE): package.m4 $(srcdir)/tests/testsuite.at $(TESTSUITE_AT) 
 	$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
 	mv $@.tmp $@