+# PSPP - a program for statistical analysis.
+# Copyright (C) 2017 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
## Process this file with automake to produce Makefile.in -*- makefile -*-
check_PROGRAMS += \
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/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/libpspp/stringi-set-test \
tests/libpspp/tower-test \
tests/libpspp/u8-istream-test \
- tests/output/render-test
+ tests/libpspp/zip-test \
+ tests/math/chart-get-ticks-format-test \
+ tests/math/chart-get-scale-test \
+ tests/output/render-test \
+ tests/ui/syntax-gen-test
+
check-programs: $(check_PROGRAMS)
tests_data_datasheet_test_SOURCES = \
tests/data/datasheet-test.c
-tests_data_datasheet_test_LDADD = src/libpspp-core.la $(LIBINTL)
+tests_data_datasheet_test_LDADD = src/libpspp-core.la
tests_data_datasheet_test_CFLAGS = $(AM_CFLAGS)
tests_data_sack_SOURCES = \
tests/data/sack.c
-tests_data_sack_LDADD = src/libpspp-core.la $(LIBINTL)
+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_ll_test_LDADD = gl/libgl.la $(LIBINTL)
tests_libpspp_ll_test_CFLAGS = $(AM_CFLAGS)
tests_libpspp_llx_test_SOURCES = \
src/libpspp/ll.c \
src/libpspp/llx.c \
tests/libpspp/llx-test.c
-tests_libpspp_llx_test_LDADD = gl/libgl.la $(LIBINTL)
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 = \
- src/libpspp/heap.c \
- src/libpspp/pool.c \
- src/libpspp/temp-file.c \
tests/libpspp/heap-test.c
-tests_libpspp_heap_test_LDADD = gl/libgl.la $(LIBINTL)
tests_libpspp_heap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+tests_libpspp_heap_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
tests_libpspp_hmap_test_SOURCES = \
src/libpspp/hmap.c \
tests/libpspp/hmap-test.c
-tests_libpspp_hmap_test_LDADD = gl/libgl.la $(LIBINTL)
tests_libpspp_hmap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
tests_libpspp_hmapx_test_SOURCES = \
src/libpspp/hmap.c \
src/libpspp/hmapx.c \
tests/libpspp/hmapx-test.c
-tests_libpspp_hmapx_test_LDADD = gl/libgl.la $(LIBINTL)
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 $(LIBINTL)
+tests_libpspp_i18n_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
tests_libpspp_abt_test_SOURCES = \
src/libpspp/abt.c \
tests/libpspp/abt-test.c
-tests_libpspp_abt_test_LDADD = gl/libgl.la $(LIBINTL)
tests_libpspp_abt_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
tests_libpspp_bt_test_SOURCES = \
src/libpspp/bt.c \
tests/libpspp/bt-test.c
-tests_libpspp_bt_test_LDADD = gl/libgl.la
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.c
-tests_libpspp_range_map_test_LDADD = gl/libgl.la $(LIBINTL)
tests_libpspp_range_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
tests_libpspp_range_set_test_SOURCES = \
- src/libpspp/bt.c \
- src/libpspp/pool.c \
- src/libpspp/range-set.c \
- src/libpspp/temp-file.c \
tests/libpspp/range-set-test.c
-tests_libpspp_range_set_test_LDADD = gl/libgl.la $(LIBINTL)
tests_libpspp_range_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+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 $(LIBINTL)
+tests_libpspp_str_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
tests_libpspp_string_map_test_SOURCES = \
- src/libpspp/hash-functions.c \
- src/libpspp/hmap.c \
- src/libpspp/string-map.c \
- src/libpspp/string-set.c \
tests/libpspp/string-map-test.c
-tests_libpspp_string_map_test_LDADD = gl/libgl.la $(LIBINTL)
tests_libpspp_string_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+tests_libpspp_string_map_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
tests_libpspp_stringi_map_test_SOURCES = \
- src/libpspp/hash-functions.c \
- src/libpspp/hmap.c \
- src/libpspp/pool.c \
- src/libpspp/str.c \
- src/libpspp/stringi-map.c \
- src/libpspp/string-set.c \
- src/libpspp/stringi-set.c \
- src/libpspp/temp-file.c \
tests/libpspp/stringi-map-test.c
-tests_libpspp_stringi_map_test_LDADD = gl/libgl.la $(LIBINTL)
tests_libpspp_stringi_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+tests_libpspp_stringi_map_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
tests_libpspp_string_set_test_SOURCES = \
src/libpspp/hash-functions.c \
src/libpspp/hmap.c \
src/libpspp/string-set.c \
tests/libpspp/string-set-test.c
-tests_libpspp_string_set_test_LDADD = gl/libgl.la $(LIBINTL)
tests_libpspp_string_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
tests_libpspp_stringi_set_test_SOURCES = \
- src/libpspp/hash-functions.c \
- src/libpspp/hmap.c \
- src/libpspp/pool.c \
- src/libpspp/str.c \
- src/libpspp/stringi-set.c \
- src/libpspp/temp-file.c \
tests/libpspp/stringi-set-test.c
-tests_libpspp_stringi_set_test_LDADD = gl/libgl.la $(LIBINTL)
tests_libpspp_stringi_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+tests_libpspp_stringi_set_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
tests_libpspp_tower_test_SOURCES = \
- src/libpspp/abt.c \
- src/libpspp/pool.c \
- src/libpspp/temp-file.c \
- src/libpspp/tower.c \
tests/libpspp/tower-test.c
-tests_libpspp_tower_test_LDADD = gl/libgl.la $(LIBINTL)
tests_libpspp_tower_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+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 = \
- src/libpspp/sparse-array.c \
- src/libpspp/pool.c \
- tests/libpspp/sparse-array-test.c \
- src/libpspp/temp-file.c
-tests_libpspp_sparse_array_test_LDADD = gl/libgl.la $(LIBINTL)
+ 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/liblibpspp.la gl/libgl.la
tests_libpspp_sparse_xarray_test_SOURCES = \
- src/libpspp/argv-parser.c \
- src/libpspp/bt.c \
- src/libpspp/deque.c \
- src/libpspp/ext-array.c \
- src/libpspp/model-checker.c \
- src/libpspp/range-set.c \
- src/libpspp/sparse-array.c \
- src/libpspp/sparse-xarray.c \
- src/libpspp/str.c \
- src/libpspp/pool.c \
- src/libpspp/temp-file.c \
tests/libpspp/sparse-xarray-test.c
-tests_libpspp_sparse_xarray_test_LDADD = gl/libgl.la $(LIBINTL)
tests_libpspp_sparse_xarray_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+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
-noinst_PROGRAMS += tests/dissect-sysfile
-tests_dissect_sysfile_SOURCES = \
- src/libpspp/integer-format.c \
- src/libpspp/float-format.c \
- tests/dissect-sysfile.c
-tests_dissect_sysfile_LDADD = gl/libgl.la $(LIBINTL)
-tests_dissect_sysfile_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\"
-
check_PROGRAMS += tests/language/lexer/command-name-test
tests_language_lexer_command_name_test_SOURCES = \
src/data/identifier.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 \
- gl/libgl.la \
- $(LIBINTL)
+ src/libpspp/liblibpspp.la \
+ gl/libgl.la
tests_language_lexer_command_name_test_CFLAGS = $(AM_CFLAGS)
check_PROGRAMS += tests/language/lexer/scan-test
src/language/lexer/scan.c \
src/language/lexer/segment.c \
src/language/lexer/token.c \
- src/libpspp/pool.c \
- src/libpspp/prompt.c \
- src/libpspp/str.c \
- src/libpspp/temp-file.c \
tests/language/lexer/scan-test.c
-tests_language_lexer_scan_test_LDADD = gl/libgl.la $(LIBINTL)
tests_language_lexer_scan_test_CFLAGS = $(AM_CFLAGS)
+tests_language_lexer_scan_test_LDADD = \
+ src/libpspp/liblibpspp.la \
+ gl/libgl.la
check_PROGRAMS += tests/language/lexer/segment-test
tests_language_lexer_segment_test_SOURCES = \
src/data/identifier.c \
src/language/lexer/command-name.c \
src/language/lexer/segment.c \
- src/libpspp/pool.c \
- src/libpspp/prompt.c \
- src/libpspp/str.c \
- src/libpspp/temp-file.c \
tests/language/lexer/segment-test.c
-tests_language_lexer_segment_test_LDADD = gl/libgl.la $(LIBINTL)
tests_language_lexer_segment_test_CFLAGS = $(AM_CFLAGS)
+tests_language_lexer_segment_test_LDADD = \
+ 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/liblibpspp.la \
+ src/libpspp-core.la \
+ gl/libgl.la
+
+check_PROGRAMS += tests/math/chart-get-scale-test
+tests_math_chart_get_scale_test_SOURCES = tests/math/chart-get-scale-test.c
+tests_math_chart_get_scale_test_LDADD = \
+ src/math/libpspp-math.la \
+ src/libpspp/liblibpspp.la \
+ src/libpspp-core.la \
+ gl/libgl.la
+
+check_PROGRAMS += tests/math/chart-get-ticks-format-test
+tests_math_chart_get_ticks_format_test_SOURCES = tests/math/chart-get-ticks-format-test.c
+tests_math_chart_get_ticks_format_test_LDADD = \
+ src/math/libpspp-math.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 = \
src/libpspp.la \
src/libpspp-core.la \
- $(CAIRO_LIBS) \
- $(LIBICONV) \
- $(LIBINTL)
+ $(CAIRO_LIBS)
+
+
+check_PROGRAMS += tests/ui/syntax-gen-test
+tests_ui_syntax_gen_test_SOURCES = tests/ui/syntax-gen-test.c
+tests_ui_syntax_gen_test_LDADD = \
+ src/ui/libuicommon.la \
+ src/libpspp-core.la \
+ $(CAIRO_LIBS)
+
EXTRA_DIST += \
tests/coverage.sh \
+ tests/data/CVE-2017-10791.sav \
+ tests/data/CVE-2017-10792.sav \
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/num-out.expected.cmp.gz \
tests/data/v13.sav \
tests/data/v14.sav \
- tests/language/data-io/Book1.gnm.unzipped
+ tests/data/test-encrypted.sps \
+ tests/language/mann-whitney.txt \
+ tests/language/data-io/Book1.gnm.unzipped \
+ tests/language/data-io/test.ods \
+ tests/language/data-io/newone.ods \
+ tests/language/stats/llz.zsav
CLEANFILES += *.save pspp.* foo*
-
-EXTRA_DIST += tests/OChangeLog
\f
# Autotest testsuite
tests/data/data-in.at \
tests/data/data-out.at \
tests/data/datasheet-test.at \
+ tests/data/dictionary.at \
+ tests/data/file.at \
tests/data/format-guesser.at \
+ tests/data/pc+-file-reader.at \
tests/data/por-file.at \
tests/data/sys-file-reader.at \
tests/data/sys-file.at \
+ tests/data/encrypted-file.at \
tests/language/command.at \
tests/language/control/do-if.at \
tests/language/control/do-repeat.at \
tests/language/data-io/data-reader.at \
tests/language/data-io/dataset.at \
tests/language/data-io/file-handle.at \
- tests/language/data-io/get-data-gnm.at \
+ tests/language/data-io/get-data-spreadsheet.at \
tests/language/data-io/get-data-psql.at \
tests/language/data-io/get-data-txt.at \
tests/language/data-io/get.at \
tests/language/data-io/inpt-pgm.at \
tests/language/data-io/list.at \
tests/language/data-io/match-files.at \
+ tests/language/data-io/matrix-data.at \
tests/language/data-io/print-space.at \
tests/language/data-io/print.at \
tests/language/data-io/save.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/dictionary/rename-variables.at \
+ tests/language/dictionary/sort-variables.at \
tests/language/dictionary/split-file.at \
tests/language/dictionary/sys-file-info.at \
tests/language/dictionary/value-labels.at \
tests/language/stats/crosstabs.at \
tests/language/stats/descriptives.at \
tests/language/stats/examine.at \
+ tests/language/stats/graph.at \
tests/language/stats/factor.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/stats/quick-cluster.at \
tests/language/stats/sort-cases.at \
tests/language/stats/t-test.at \
tests/language/utilities/cache.at \
+ tests/language/utilities/cd.at \
tests/language/utilities/date.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 \
tests/libpspp/stringi-set.at \
tests/libpspp/tower.at \
tests/libpspp/u8-istream.at \
+ tests/libpspp/zip.at \
+ tests/math/chart-geometry.at \
tests/math/moments.at \
tests/math/randist.at \
tests/output/ascii.at \
tests/output/charts.at \
+ tests/output/html.at \
tests/output/output.at \
tests/output/paper-size.at \
tests/output/render.at \
+ tests/output/tables.at \
tests/ui/terminal/main.at \
+ tests/ui/syntax-gen.at \
+ tests/utilities/pspp-convert.at \
tests/perl-module.at
TESTSUITE = $(srcdir)/tests/testsuite
-DISTCLEANFILES += tests/atconfig tests/atlocal $(TESTSUITE)
-AUTOTEST_PATH = tests/data:tests/language/lexer:tests/libpspp:tests/output:src/ui/terminal
+DISTCLEANFILES += tests/atconfig tests/atlocal
+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 $< $@
- for t in $(TESTSUITE_AT); do \
- echo "m4_include([$$t])" >> $@ ;\
+ $(AM_V_GEN)printf '\043 Generated automatically -- do not modify! -*- buffer-read-only: t -*-\n' > $@,tmp
+ $(AM_V_at)cat $< >> $@,tmp
+ $(AM_V_at)for t in $(TESTSUITE_AT); do \
+ echo "m4_include([$$t])" >> $@,tmp ;\
done
+ mv $@,tmp $@
+
EXTRA_DIST += tests/testsuite.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) RUNNER='$(RUNNER)' $(TESTSUITEFLAGS)
CLEAN_LOCAL += tests_clean
tests_clean:
AUTOM4TE = $(SHELL) $(srcdir)/build-aux/missing --run autom4te
AUTOTEST = $(AUTOM4TE) --language=autotest
$(TESTSUITE): package.m4 $(srcdir)/tests/testsuite.at $(TESTSUITE_AT)
- $(AUTOTEST) -I '$(srcdir)' $@.at | sed 's/@<00A0>@/ /g' > $@.tmp
- mv $@.tmp $@
+ $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' $@.at | $(SED) 's/@<00A0>@/ /g' > $@.tmp
+ test -s $@.tmp
+ $(AM_V_at)mv $@.tmp $@
# The `:;' works around a Bash 3.2 bug when the output is not writeable.
$(srcdir)/package.m4: $(top_srcdir)/configure.ac
- :;{ \
+ $(AM_V_GEN):;{ \
echo '# Signature of the current package.' && \
echo 'm4_define([AT_PACKAGE_NAME], [$(PACKAGE_NAME)])' && \
echo 'm4_define([AT_PACKAGE_TARNAME], [$(PACKAGE_TARNAME)])' && \
echo 'm4_define([AT_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])' && \
echo 'm4_define([AT_PACKAGE_URL], [$(PACKAGE_URL)])'; \
} >'$(srcdir)/package.m4'
-\f
-# valgrind support for Autotest testsuite
-
-valgrind_wrappers = \
- tests/valgrind/datasheet-test \
- tests/valgrind/command-name-test \
- tests/valgrind/scan-test \
- tests/valgrind/segment-test \
- tests/valgrind/abt-test \
- tests/valgrind/bt-test \
- tests/valgrind/encoding-guesser-test \
- tests/valgrind/heap-test \
- tests/valgrind/hmap-test \
- tests/valgrind/hmapx-test \
- tests/valgrind/i18n-test \
- tests/valgrind/ll-test \
- tests/valgrind/llx-test \
- tests/valgrind/range-map-test \
- tests/valgrind/range-set-test \
- tests/valgrind/sparse-array-test \
- tests/valgrind/sparse-xarray-test \
- tests/valgrind/str-test \
- tests/valgrind/string-map-test \
- tests/valgrind/stringi-map-test \
- tests/valgrind/string-set-test \
- tests/valgrind/stringi-set-test \
- tests/valgrind/tower-test \
- tests/valgrind/u8-istream-test \
- tests/valgrind/render-test \
- tests/valgrind/pspp
-
-$(valgrind_wrappers): tests/valgrind-wrapper.in
- @test -d tests/valgrind || mkdir tests/valgrind
- sed -e 's,[@]wrap_program[@],$@,' \
- $(top_srcdir)/tests/valgrind-wrapper.in > $@.tmp
- chmod +x $@.tmp
- mv $@.tmp $@
-CLEANFILES += $(valgrind_wrappers)
-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)
+
+check-valgrind:
+ $(MAKE) check RUNNER='$(SHELL) $(abs_top_builddir)/libtool --mode=execute valgrind --log-file=valgrind.%p --leak-check=full --num-callers=20' TESTSUITEFLAGS='$(TESTSUITEFLAGS) -d'
@echo
@echo '--------------------------------'
@echo 'Valgrind output is in:'
projects / pspp / blobdiff