Merge 'master' into 'psppsheet'.

[pspp] / tests / automake.mk

diff --git a/tests/automake.mk b/tests/automake.mk
index ade39f9e7b2e8c1f2dd67e125ee8fda78b13b802..6c4cef20aa082442cf7590bf820c62665a56c79b 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -14,6 +14,7 @@ check_PROGRAMS += \
        tests/libpspp/hmap-test \
        tests/libpspp/hmapx-test \
        tests/libpspp/i18n-test \
+       tests/libpspp/line-reader-test \
        tests/libpspp/ll-test \
        tests/libpspp/llx-test \
        tests/libpspp/range-map-test \
@@ -43,6 +44,9 @@ tests_data_sack_SOURCES = \
 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_ll_test_SOURCES = \
        src/libpspp/ll.c \
        tests/libpspp/ll-test.c
@@ -103,7 +107,7 @@ tests_libpspp_range_set_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
 tests_libpspp_range_tower_test_SOURCES = \
        tests/libpspp/range-tower-test.c
 tests_libpspp_range_tower_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
-tests_libpspp_range_tower_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
+tests_libpspp_range_tower_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
 
 tests_libpspp_str_test_SOURCES = \
        tests/libpspp/str-test.c
@@ -289,6 +293,7 @@ TESTSUITE_AT = \
        tests/language/stats/flip.at \
        tests/language/stats/frequencies.at \
        tests/language/stats/glm.at \
+       tests/language/stats/logistic.at \
        tests/language/stats/means.at \
        tests/language/stats/npar.at \
        tests/language/stats/oneway.at \
@@ -320,6 +325,7 @@ TESTSUITE_AT = \
        tests/libpspp/hmap.at \
        tests/libpspp/hmapx.at \
        tests/libpspp/i18n.at \
+       tests/libpspp/line-reader.at \
        tests/libpspp/ll.at \
        tests/libpspp/llx.at \
        tests/libpspp/range-map.at \