X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Fautomake.mk;h=f3e14e7e98b9237551ff715d3d9b8ce47022c64d;hb=fcd2c3faf2ebc7d08e3c58c746fc5946b467c075;hp=1dba99efa1a64af7dc908280499fa67731609ad8;hpb=f0827ef96044219fea423d73147937c4c266827b;p=pspp

diff --git a/tests/automake.mk b/tests/automake.mk
index 1dba99efa1..f3e14e7e98 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
 
 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
@@ -282,7 +280,8 @@ EXTRA_DIST += \
 	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*
 
@@ -428,6 +427,7 @@ 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