X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=66e17bb2a7010b4cdbd190f20932ee9fec18faec;hb=13bc7e5d95ddbcfcce29080eb2ca2b6eb17d7433;hp=0a8b8e36575b51d9914ced7be5a81956e9b38967;hpb=facb4a1ad3c9e8b2cdf55824680eed2afb91aebe;p=pspp

diff --git a/tests/automake.mk b/tests/automake.mk
index 0a8b8e3657..66e17bb2a7 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -66,7 +66,7 @@ tests_data_sack_LDADD = src/libpspp-core.la
 tests_data_sack_CFLAGS = $(AM_CFLAGS)
 
 tests_libpspp_line_reader_test_SOURCES = tests/libpspp/line-reader-test.c
-tests_libpspp_line_reader_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
+tests_libpspp_line_reader_test_LDADD = src/libpspp-core.la
 
 tests_libpspp_ll_test_SOURCES = \
 	src/libpspp/ll.c \
@@ -81,9 +81,7 @@ tests_libpspp_llx_test_CFLAGS = $(AM_CFLAGS)
 
 tests_libpspp_encoding_guesser_test_SOURCES = \
 	tests/libpspp/encoding-guesser-test.c
-tests_libpspp_encoding_guesser_test_LDADD = \
-	src/libpspp/liblibpspp.la \
-	gl/libgl.la
+tests_libpspp_encoding_guesser_test_LDADD = src/libpspp-core.la
 
 tests_libpspp_heap_test_SOURCES = \
 	tests/libpspp/heap-test.c
@@ -102,7 +100,7 @@ tests_libpspp_hmapx_test_SOURCES = \
 tests_libpspp_hmapx_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_i18n_test_SOURCES = tests/libpspp/i18n-test.c
-tests_libpspp_i18n_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
+tests_libpspp_i18n_test_LDADD = src/libpspp-core.la gl/libgl.la
 
 tests_libpspp_abt_test_SOURCES = \
 	src/libpspp/abt.c \
@@ -147,7 +145,7 @@ tests_libpspp_string_map_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
 tests_libpspp_stringi_map_test_SOURCES = \
 	tests/libpspp/stringi-map-test.c
 tests_libpspp_stringi_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
-tests_libpspp_stringi_map_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
+tests_libpspp_stringi_map_test_LDADD = src/libpspp-core.la
 
 tests_libpspp_string_set_test_SOURCES = \
 	src/libpspp/hash-functions.c \
@@ -159,7 +157,7 @@ tests_libpspp_string_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 tests_libpspp_stringi_set_test_SOURCES = \
 	tests/libpspp/stringi-set-test.c
 tests_libpspp_stringi_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
-tests_libpspp_stringi_set_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
+tests_libpspp_stringi_set_test_LDADD = src/libpspp-core.la
 
 tests_libpspp_tower_test_SOURCES = \
 	tests/libpspp/tower-test.c
@@ -167,7 +165,7 @@ tests_libpspp_tower_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 tests_libpspp_tower_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
 
 tests_libpspp_u8_istream_test_SOURCES = tests/libpspp/u8-istream-test.c
-tests_libpspp_u8_istream_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
+tests_libpspp_u8_istream_test_LDADD = src/libpspp-core.la
 
 tests_libpspp_sparse_array_test_SOURCES = \
 	tests/libpspp/sparse-array-test.c
@@ -275,12 +273,15 @@ EXTRA_DIST += \
 	tests/data/v13.sav \
 	tests/data/v14.sav \
 	tests/data/test-encrypted.sps \
+	tests/data/test-decrypted.spv \
+	tests/data/test-encrypted.spv \
 	tests/language/mann-whitney.txt \
 	tests/language/data-io/Book1.gnm.unzipped \
 	tests/language/data-io/test.ods \
 	tests/language/data-io/newone.ods \
 	tests/language/data-io/readnames.ods \
-	tests/language/stats/llz.zsav
+	tests/language/stats/llz.zsav \
+	tests/utilities/regress.spv
 
 CLEANFILES += *.save pspp.* foo*
 
@@ -379,6 +380,7 @@ TESTSUITE_AT = \
 	tests/language/utilities/cache.at \
 	tests/language/utilities/cd.at \
 	tests/language/utilities/date.at \
+	tests/language/utilities/host.at \
 	tests/language/utilities/insert.at \
 	tests/language/utilities/permissions.at \
 	tests/language/utilities/set.at \
@@ -426,11 +428,12 @@ TESTSUITE_AT = \
 	tests/ui/terminal/main.at \
 	tests/ui/syntax-gen.at \
 	tests/utilities/pspp-convert.at \
+	tests/utilities/pspp-output.at \
 	tests/perl-module.at
 
 TESTSUITE = $(srcdir)/tests/testsuite
 DISTCLEANFILES += tests/atconfig tests/atlocal
-AUTOTEST_PATH = tests/data:tests/language/lexer:tests/libpspp:tests/output:src/ui/terminal:utilities
+AUTOTEST_PATH = tests/data:tests/language/lexer:tests/libpspp:tests/output:tests/math:src/ui/terminal:utilities
 
 $(srcdir)/tests/testsuite.at: tests/testsuite.in tests/automake.mk
 	$(AM_V_GEN)printf '\043 Generated automatically -- do not modify!    -*- buffer-read-only: t -*-\n' > $@,tmp