Use the msg function to report errors wherever possible.

[pspp] / tests / automake.mk

diff --git a/tests/automake.mk b/tests/automake.mk
index 47951c53923a30d8b9f637d3b38ecfa6a3593e01..c104ecca4774828371124ae443d3195cb5f88928 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -151,7 +151,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_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
 
@@ -192,12 +194,13 @@ tests_language_lexer_segment_test_LDADD = \
 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 \
+       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 = \
@@ -432,7 +435,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)
-       $(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:'