fixed sparse-array linker problem

[pspp-builds.git] / tests / automake.mk

diff --git a/tests/automake.mk b/tests/automake.mk
index c682bbd2b2e7858cb736aedef5fe54dd504ff75d..998be3a51dae067240f2d830867b5b20505b29df 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -2,7 +2,7 @@
 
 TESTS_ENVIRONMENT = top_srcdir='$(top_srcdir)' top_builddir='$(top_builddir)'
 TESTS_ENVIRONMENT += PERL='@PERL@'
-TESTS = \
+dist_TESTS = \
        tests/command/aggregate.sh \
        tests/command/autorecod.sh \
        tests/command/beg-data.sh \
@@ -57,6 +57,7 @@ TESTS = \
        tests/command/trimmed-mean.sh \
        tests/command/tabs.sh \
        tests/command/use.sh \
+       tests/command/vector.sh \
        tests/command/very-long-strings.sh \
        tests/command/weight.sh \
        tests/formats/bcd-in.sh \
@@ -129,16 +130,20 @@ TESTS = \
        tests/expressions/randist.sh \
        tests/expressions/valuelabel.sh \
        tests/expressions/variables.sh \
-       tests/expressions/vectors.sh \
+       tests/expressions/vectors.sh
+
+nodist_TESTS = \
        tests/libpspp/ll-test \
        tests/libpspp/llx-test \
-       tests/libpspp/heap-test
+       tests/libpspp/heap-test \
+       tests/libpspp/abt-test \
+       tests/libpspp/sparse-array-test
+
+TESTS = $(dist_TESTS) $(nodist_TESTS)
 
 check_PROGRAMS += \
-       tests/libpspp/ll-test \
-       tests/libpspp/llx-test \
-       tests/formats/inexactify \
-       tests/libpspp/heap-test
+       $(nodist_TESTS) \
+       tests/formats/inexactify
 
 tests_libpspp_ll_test_SOURCES = \
        src/libpspp/ll.c \
@@ -158,12 +163,30 @@ 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
+tests_libpspp_heap_test_LDADD = gl/libgl.la @LIBINTL@
 tests_libpspp_heap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
+tests_libpspp_abt_test_SOURCES = \
+       src/libpspp/abt.c \
+       src/libpspp/abt.h \
+       tests/libpspp/abt-test.c
+tests_libpspp_abt_test_LDADD = gl/libgl.la
+tests_libpspp_abt_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+
+tests_libpspp_sparse_array_test_SOURCES = \
+       src/libpspp/sparse-array.c \
+       src/libpspp/sparse-array.h \
+       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_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+
 tests_formats_inexactify_SOURCES = tests/formats/inexactify.c
 
-EXTRA_DIST += $(TESTS) tests/weighting.data tests/data-list.data tests/list.data \
+EXTRA_DIST += \
+       $(dist_TESTS) \
+       tests/weighting.data tests/data-list.data tests/list.data \
        tests/no_case_size.sav \
        tests/coverage.sh tests/test_template \
        tests/v13.sav tests/v14.sav \