projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: Make pspp-convert respect "make check-valgrind".
[pspp]
/
tests
/
automake.mk
diff --git
a/tests/automake.mk
b/tests/automake.mk
index 47951c53923a30d8b9f637d3b38ecfa6a3593e01..d89f6dd1baaf3b2fda0160dfc5043a1f7d5ba752 100644
(file)
--- a/
tests/automake.mk
+++ b/
tests/automake.mk
@@
-9,6
+9,7
@@
check_PROGRAMS += \
tests/language/lexer/segment-test \
tests/libpspp/abt-test \
tests/libpspp/bt-test \
tests/language/lexer/segment-test \
tests/libpspp/abt-test \
tests/libpspp/bt-test \
+ tests/libpspp/cmac-aes256-test \
tests/libpspp/encoding-guesser-test \
tests/libpspp/heap-test \
tests/libpspp/hmap-test \
tests/libpspp/encoding-guesser-test \
tests/libpspp/heap-test \
tests/libpspp/hmap-test \
@@
-93,6
+94,11
@@
tests_libpspp_bt_test_SOURCES = \
tests/libpspp/bt-test.c
tests_libpspp_bt_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
tests/libpspp/bt-test.c
tests_libpspp_bt_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+tests_libpspp_cmac_aes256_test_SOURCES = \
+ src/libpspp/cmac-aes256.c \
+ tests/libpspp/cmac-aes256-test.c
+tests_libpspp_cmac_aes256_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+
tests_libpspp_range_map_test_SOURCES = \
src/libpspp/bt.c \
src/libpspp/range-map.c \
tests_libpspp_range_map_test_SOURCES = \
src/libpspp/bt.c \
src/libpspp/range-map.c \
@@
-151,7
+157,9
@@
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_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/liblibpspp.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
tests_data_inexactify_SOURCES = tests/data/inexactify.c
@@
-192,12
+200,13
@@
tests_language_lexer_segment_test_LDADD = \
check_PROGRAMS += tests/libpspp/zip-test
tests_libpspp_zip_test_SOURCES = \
tests/libpspp/zip-test.c
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/liblibpspp.la \
tests_libpspp_zip_test_CFLAGS = $(AM_CFLAGS)
tests_libpspp_zip_test_LDADD = \
src/libpspp/liblibpspp.la \
+ src/libpspp-core.la \
gl/libgl.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 = \
check_PROGRAMS += tests/output/render-test
tests_output_render_test_SOURCES = tests/output/render-test.c
tests_output_render_test_LDADD = \
@@
-210,6
+219,7
@@
EXTRA_DIST += \
tests/data/bcd-in.expected.cmp.gz \
tests/data/binhex-in.expected.cmp.gz \
tests/data/binhex-out.expected.gz \
tests/data/bcd-in.expected.cmp.gz \
tests/data/binhex-in.expected.cmp.gz \
tests/data/binhex-out.expected.gz \
+ tests/data/hotel-encrypted.sav \
tests/data/legacy-in.expected.cmp.gz \
tests/data/num-in.expected.gz \
tests/data/num-out-cmp.pl \
tests/data/legacy-in.expected.cmp.gz \
tests/data/num-in.expected.gz \
tests/data/num-out-cmp.pl \
@@
-243,6
+253,7
@@
TESTSUITE_AT = \
tests/data/por-file.at \
tests/data/sys-file-reader.at \
tests/data/sys-file.at \
tests/data/por-file.at \
tests/data/sys-file-reader.at \
tests/data/sys-file.at \
+ tests/data/sys-file-encryption.at \
tests/language/command.at \
tests/language/control/do-if.at \
tests/language/control/do-repeat.at \
tests/language/command.at \
tests/language/control/do-if.at \
tests/language/control/do-repeat.at \
@@
-355,7
+366,7
@@
TESTSUITE_AT = \
TESTSUITE = $(srcdir)/tests/testsuite
DISTCLEANFILES += tests/atconfig tests/atlocal $(TESTSUITE)
TESTSUITE = $(srcdir)/tests/testsuite
DISTCLEANFILES += tests/atconfig tests/atlocal $(TESTSUITE)
-AUTOTEST_PATH = tests/data:tests/language/lexer:tests/libpspp:tests/output:src/ui/terminal
+AUTOTEST_PATH = tests/data:tests/language/lexer:tests/libpspp:tests/output:src/ui/terminal
:utilities
$(srcdir)/tests/testsuite.at: tests/testsuite.in tests/automake.mk
cp $< $@
$(srcdir)/tests/testsuite.at: tests/testsuite.in tests/automake.mk
cp $< $@
@@
-419,6
+430,7
@@
valgrind_wrappers = \
tests/valgrind/tower-test \
tests/valgrind/u8-istream-test \
tests/valgrind/render-test \
tests/valgrind/tower-test \
tests/valgrind/u8-istream-test \
tests/valgrind/render-test \
+ tests/valgrind/pspp-convert \
tests/valgrind/pspp
$(valgrind_wrappers): tests/valgrind-wrapper.in
tests/valgrind/pspp
$(valgrind_wrappers): tests/valgrind-wrapper.in
@@
-432,7
+444,7
@@
EXTRA_DIST += tests/valgrind-wrapper.in
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)
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:'
@echo
@echo '--------------------------------'
@echo 'Valgrind output is in:'