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 \
tests/libpspp/range-set-test \
+ tests/libpspp/range-tower-test \
tests/libpspp/sparse-array-test \
tests/libpspp/sparse-xarray-test \
tests/libpspp/str-test \
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
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 \
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 \
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/liblibpspp.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 \
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 \
+ src/libpspp-core.la \
+ gl/libgl.la
tests_data_inexactify_SOURCES = tests/data/inexactify.c
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)
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
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
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 \
+ src/libpspp-core.la \
gl/libgl.la
-
check_PROGRAMS += tests/output/render-test
tests_output_render_test_SOURCES = tests/output/render-test.c
tests_output_render_test_LDADD = \
tests/data/data-in.at \
tests/data/data-out.at \
tests/data/datasheet-test.at \
+ tests/data/dictionary.at \
tests/data/format-guesser.at \
tests/data/por-file.at \
tests/data/sys-file-reader.at \
tests/language/data-io/save-translate.at \
tests/language/data-io/update.at \
tests/language/dictionary/attributes.at \
+ tests/language/dictionary/delete-variables.at \
tests/language/dictionary/formats.at \
tests/language/dictionary/missing-values.at \
tests/language/dictionary/mrsets.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 \
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 \
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 \
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 \
CHECK_LOCAL += tests_check
tests_check: tests/atconfig tests/atlocal $(TESTSUITE) $(check_PROGRAMS)
- $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) $(TESTSUITEFLAGS)
+ XTERM_LOCALE='' $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) $(TESTSUITEFLAGS)
CLEAN_LOCAL += tests_clean
tests_clean:
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 \
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
VALGRIND = $(SHELL) $(abs_top_builddir)/libtool --mode=execute valgrind --log-file=valgrind.%p --leak-check=full --num-callers=20
check-valgrind: all tests/atconfig tests/atlocal $(TESTSUITE) $(valgrind_wrappers)
- $(SHELL) '$(TESTSUITE)' -C tests VALGRIND='$(VALGRIND)' AUTOTEST_PATH='tests/valgrind:$(AUTOTEST_PATH)' -d $(TESTSUITEFLAGS)
+ XTERM_LOCALE='' $(SHELL) '$(TESTSUITE)' -C tests VALGRIND='$(VALGRIND)' AUTOTEST_PATH='tests/valgrind:$(AUTOTEST_PATH)' -d $(TESTSUITEFLAGS)
@echo
@echo '--------------------------------'
@echo 'Valgrind output is in:'