New "range-tower" data structure.

[pspp] / tests / automake.mk

diff --git a/tests/automake.mk b/tests/automake.mk
index 1a9ef8442120a5de7db357fc540b9320e63b155a..ade39f9e7b2e8c1f2dd67e125ee8fda78b13b802 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -18,6 +18,7 @@ check_PROGRAMS += \
        tests/libpspp/llx-test \
        tests/libpspp/range-map-test \
        tests/libpspp/range-set-test \
+       tests/libpspp/range-tower-test \
        tests/libpspp/sparse-array-test \
        tests/libpspp/sparse-xarray-test \
        tests/libpspp/str-test \
@@ -55,12 +56,14 @@ 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/libpspp.la gl/libgl.la
+tests_libpspp_encoding_guesser_test_LDADD = \
+       src/libpspp/liblibpspp.la \
+       gl/libgl.la
 
 tests_libpspp_heap_test_SOURCES = \
        tests/libpspp/heap-test.c
 tests_libpspp_heap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
-tests_libpspp_heap_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
+tests_libpspp_heap_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
 
 tests_libpspp_hmap_test_SOURCES = \
        src/libpspp/hmap.c \
@@ -74,7 +77,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/libpspp.la gl/libgl.la 
+tests_libpspp_i18n_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la 
 
 tests_libpspp_abt_test_SOURCES = \
        src/libpspp/abt.c \
@@ -95,21 +98,26 @@ tests_libpspp_range_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 tests_libpspp_range_set_test_SOURCES = \
        tests/libpspp/range-set-test.c
 tests_libpspp_range_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
-tests_libpspp_range_set_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
+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_str_test_SOURCES = \
        tests/libpspp/str-test.c
-tests_libpspp_str_test_LDADD = src/libpspp/libpspp.la gl/libgl.la 
+tests_libpspp_str_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la 
 
 tests_libpspp_string_map_test_SOURCES = \
        tests/libpspp/string-map-test.c
 tests_libpspp_string_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
-tests_libpspp_string_map_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
+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/libpspp.la gl/libgl.la
+tests_libpspp_stringi_map_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
 
 tests_libpspp_string_set_test_SOURCES = \
        src/libpspp/hash-functions.c \
@@ -121,25 +129,25 @@ 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/libpspp.la gl/libgl.la
+tests_libpspp_stringi_set_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
 
 tests_libpspp_tower_test_SOURCES = \
        tests/libpspp/tower-test.c
 tests_libpspp_tower_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
-tests_libpspp_tower_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
+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/libpspp.la gl/libgl.la
+tests_libpspp_u8_istream_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
 
 tests_libpspp_sparse_array_test_SOURCES = \
        tests/libpspp/sparse-array-test.c 
 tests_libpspp_sparse_array_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
-tests_libpspp_sparse_array_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
+tests_libpspp_sparse_array_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
 
 tests_libpspp_sparse_xarray_test_SOURCES = \
        tests/libpspp/sparse-xarray-test.c
 tests_libpspp_sparse_xarray_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
-tests_libpspp_sparse_xarray_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
+tests_libpspp_sparse_xarray_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
 
 tests_data_inexactify_SOURCES = tests/data/inexactify.c
 
@@ -149,7 +157,7 @@ tests_language_lexer_command_name_test_SOURCES = \
        src/language/lexer/command-name.c \
        tests/language/lexer/command-name-test.c
 tests_language_lexer_command_name_test_LDADD = \
-       src/libpspp/libpspp.la \
+       src/libpspp/liblibpspp.la \
        gl/libgl.la 
 tests_language_lexer_command_name_test_CFLAGS = $(AM_CFLAGS)
 
@@ -163,7 +171,7 @@ tests_language_lexer_scan_test_SOURCES = \
        tests/language/lexer/scan-test.c
 tests_language_lexer_scan_test_CFLAGS = $(AM_CFLAGS)
 tests_language_lexer_scan_test_LDADD = \
-       src/libpspp/libpspp.la \
+       src/libpspp/liblibpspp.la \
        gl/libgl.la 
 
 check_PROGRAMS += tests/language/lexer/segment-test
@@ -174,7 +182,7 @@ tests_language_lexer_segment_test_SOURCES = \
        tests/language/lexer/segment-test.c
 tests_language_lexer_segment_test_CFLAGS = $(AM_CFLAGS)
 tests_language_lexer_segment_test_LDADD = \
-       src/libpspp/libpspp.la \
+       src/libpspp/liblibpspp.la \
        gl/libgl.la 
 
 check_PROGRAMS += tests/libpspp/zip-test
@@ -182,7 +190,7 @@ tests_libpspp_zip_test_SOURCES = \
        tests/libpspp/zip-test.c
 tests_libpspp_zip_test_CFLAGS = $(AM_CFLAGS)
 tests_libpspp_zip_test_LDADD = \
-       src/libpspp/libpspp.la \
+       src/libpspp/liblibpspp.la \
        gl/libgl.la 
 
 
@@ -297,6 +305,7 @@ TESTSUITE_AT = \
        tests/language/utilities/insert.at \
        tests/language/utilities/permissions.at \
        tests/language/utilities/set.at \
+       tests/language/utilities/show.at \
        tests/language/utilities/title.at \
        tests/language/xforms/compute.at \
        tests/language/xforms/count.at \
@@ -315,6 +324,7 @@ TESTSUITE_AT = \
        tests/libpspp/llx.at \
        tests/libpspp/range-map.at \
        tests/libpspp/range-set.at \
+       tests/libpspp/range-tower.at \
        tests/libpspp/sparse-array.at \
        tests/libpspp/sparse-xarray-test.at \
        tests/libpspp/str.at \
@@ -390,6 +400,7 @@ valgrind_wrappers = \
        tests/valgrind/llx-test \
        tests/valgrind/range-map-test \
        tests/valgrind/range-set-test \
+       tests/valgrind/range-tower-test \
        tests/valgrind/sparse-array-test \
        tests/valgrind/sparse-xarray-test \
        tests/valgrind/str-test \
@@ -403,7 +414,7 @@ valgrind_wrappers = \
        tests/valgrind/pspp
 
 $(valgrind_wrappers): tests/valgrind-wrapper.in
-       @test -d tests/valgrind || mkdir tests/valgrind
+       @$(MKDIR_P) tests/valgrind
        sed -e 's,[@]wrap_program[@],$@,' \
                $(top_srcdir)/tests/valgrind-wrapper.in > $@.tmp
        chmod +x $@.tmp