X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=abf61d15b072f86a89e1fed9b41029b667ba2e3a;hb=2e6cffa44ef5e995139abb9310c9df7fa1795cad;hp=f23a0e7773559a52a5684382782003ff5edd7399;hpb=4afd608d61b469b07f6c149e87ba25fabef9909e;p=pspp

diff --git a/tests/automake.mk b/tests/automake.mk
index f23a0e7773..abf61d15b0 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -26,7 +26,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 \
@@ -45,9 +44,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 \
@@ -207,6 +203,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
@@ -257,13 +254,14 @@ 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
 
 tests_libpspp_str_test_SOURCES = \
 	tests/libpspp/str-test.c
-tests_libpspp_str_test_LDADD = gl/libgl.la src/libpspp/libpspp.la $(LIBINTL) 
+tests_libpspp_str_test_LDADD = src/libpspp/libpspp.la gl/libgl.la $(LIBINTL) 
 
 tests_libpspp_string_map_test_SOURCES = \
 	src/libpspp/hash-functions.c \
@@ -282,6 +280,7 @@ tests_libpspp_stringi_map_test_SOURCES = \
 	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
@@ -300,6 +299,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
@@ -309,6 +309,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
@@ -320,7 +321,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
 
@@ -328,6 +330,7 @@ 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 \
@@ -413,8 +416,8 @@ EXTRA_DIST += \
 	tests/atlocal.in \
 	$(srcdir)/package.m4 \
 	$(TESTSUITE)
+
 TESTSUITE_AT = \
-	tests/testsuite.at \
 	tests/data/calendar.at \
 	tests/language/dictionary/mrsets.at \
 	tests/language/expressions/evaluate.at \
@@ -423,15 +426,26 @@ TESTSUITE_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/xforms/compute.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)
@@ -442,7 +456,7 @@ tests_clean:
 
 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 $@