X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=7dda26df8d53ebd60623bcf35aa6e49b4d487b6e;hb=a55d3f25a88c3557fc14a71c1b78c01c1972581f;hp=bf8fdafe651bdfa392967535ecb2e088e2a20322;hpb=fbe0cd10fec729bcc6af5913b9ad32c4cd716a09;p=pspp-builds.git

diff --git a/tests/automake.mk b/tests/automake.mk
index bf8fdafe..7dda26df 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -16,7 +16,6 @@ dist_TESTS = \
 	tests/command/beg-data.sh \
 	tests/command/bignum.sh \
 	tests/command/count.sh \
-	tests/command/datasheet.sh \
 	tests/command/data-list.sh \
 	tests/command/do-if.sh \
 	tests/command/do-repeat.sh \
@@ -32,7 +31,6 @@ dist_TESTS = \
 	tests/command/get-data-txt-examples.sh \
 	tests/command/get-data-txt-importcases.sh \
 	tests/command/import-export.sh \
-	tests/command/input-program.sh \
 	tests/command/insert.sh \
 	tests/command/lag.sh \
 	tests/command/line-ends.sh \
@@ -46,6 +44,7 @@ dist_TESTS = \
 	tests/command/npar-binomial.sh \
 	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 \
@@ -116,6 +115,8 @@ dist_TESTS = \
 	tests/bugs/empty-do-repeat.sh \
 	tests/bugs/get.sh \
 	tests/bugs/examine-crash.sh \
+	tests/bugs/examine-crash2.sh \
+	tests/bugs/examine-crash3.sh \
 	tests/bugs/examine-1sample.sh \
 	tests/bugs/examine-missing.sh \
 	tests/bugs/examine-missing2.sh \
@@ -130,6 +131,7 @@ dist_TESTS = \
 	tests/bugs/multipass.sh \
 	tests/bugs/overwrite-input-file.sh \
 	tests/bugs/overwrite-special-file.sh \
+	tests/bugs/piechart.sh \
 	tests/bugs/random.sh \
 	tests/bugs/signals.sh \
 	tests/bugs/t-test-with-temp.sh \
@@ -148,6 +150,8 @@ dist_TESTS = \
 	tests/bugs/temp-freq.sh \
 	tests/bugs/print-crash.sh \
 	tests/bugs/keep-all.sh \
+	tests/data/datasheet-test.sh \
+	tests/libpspp/sparse-xarray-test.sh \
 	tests/output/paper-size.sh \
 	tests/xforms/recode.sh \
 	tests/stats/descript-basic.sh \
@@ -190,7 +194,13 @@ TESTS = $(dist_TESTS) $(nodist_TESTS)
 
 check_PROGRAMS += \
 	$(nodist_TESTS) \
-	tests/formats/inexactify
+	tests/data/datasheet-test \
+	tests/formats/inexactify \
+	tests/libpspp/sparse-xarray-test
+
+tests_data_datasheet_test_SOURCES = \
+	tests/data/datasheet-test.c
+tests_data_datasheet_test_LDADD = src/libpspp-core.la @LIBINTL@ 
 
 tests_libpspp_ll_test_SOURCES = \
 	src/libpspp/ll.c \
@@ -214,7 +224,7 @@ tests_libpspp_heap_test_SOURCES = \
 	src/libpspp/pool.c \
 	src/libpspp/pool.h \
 	tests/libpspp/heap-test.c
-tests_libpspp_heap_test_LDADD = gl/libgl.la @LIBINTL@
+tests_libpspp_heap_test_LDADD = gl/libgl.la @LIBINTL@ 
 tests_libpspp_heap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_hmap_test_SOURCES = \
@@ -264,12 +274,12 @@ tests_libpspp_range_set_test_SOURCES = \
 	src/libpspp/range-set.c \
 	src/libpspp/range-set.h \
 	tests/libpspp/range-set-test.c
-tests_libpspp_range_set_test_LDADD = gl/libgl.la @LIBINTL@
+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 = src/libpspp/libpspp.la gl/libgl.la @LIBINTL@
+tests_libpspp_str_test_LDADD = src/libpspp/libpspp.la gl/libgl.la @LIBINTL@ 
 
 tests_libpspp_tower_test_SOURCES = \
 	src/libpspp/abt.c \
@@ -279,7 +289,7 @@ tests_libpspp_tower_test_SOURCES = \
 	src/libpspp/tower.c \
 	src/libpspp/tower.h \
 	tests/libpspp/tower-test.c
-tests_libpspp_tower_test_LDADD = gl/libgl.la @LIBINTL@
+tests_libpspp_tower_test_LDADD = gl/libgl.la @LIBINTL@ 
 tests_libpspp_tower_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_sparse_array_test_SOURCES = \
@@ -288,9 +298,24 @@ tests_libpspp_sparse_array_test_SOURCES = \
 	src/libpspp/pool.c \
 	src/libpspp/pool.h \
 	tests/libpspp/sparse-array-test.c
-tests_libpspp_sparse_array_test_LDADD = gl/libgl.la @LIBINTL@
+tests_libpspp_sparse_array_test_LDADD = gl/libgl.la @LIBINTL@ 
 tests_libpspp_sparse_array_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
+tests_libpspp_sparse_xarray_test_SOURCES = \
+	src/libpspp/argv-parser.c \
+	src/libpspp/bt.c \
+	src/libpspp/deque.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 \
+	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
+
 tests_formats_inexactify_SOURCES = tests/formats/inexactify.c
 
 noinst_PROGRAMS += tests/dissect-sysfile
@@ -298,7 +323,7 @@ tests_dissect_sysfile_SOURCES = \
 	src/libpspp/integer-format.c \
 	src/libpspp/float-format.c \
 	tests/dissect-sysfile.c
-tests_dissect_sysfile_LDADD = gl/libgl.la @LIBINTL@ @LIB_CLOSE@
+tests_dissect_sysfile_LDADD = gl/libgl.la @LIBINTL@ 
 tests_dissect_sysfile_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\"
 
 EXTRA_DIST += \
@@ -341,11 +366,12 @@ EXTRA_DIST += \
 
 CLEANFILES += *.save pspp.* foo*
 
-DIST_HOOKS += check-for-export-var-val
 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