+# 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/data/datasheet-test \
tests/data/sack \
+ tests/data/spreadsheet-test \
tests/data/inexactify \
tests/language/lexer/command-name-test \
tests/language/lexer/scan-test \
tests_data_sack_SOURCES = \
tests/data/sack.c
-tests_data_sack_LDADD = src/libpspp-core.la
+tests_data_sack_LDADD = src/libpspp-core.la
tests_data_sack_CFLAGS = $(AM_CFLAGS)
+
+tests_data_spreadsheet_test_SOURCES = \
+ tests/data/spreadsheet-test.c
+tests_data_spreadsheet_test_LDADD = src/libpspp-core.la
+tests_data_spreadsheet_test_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_line_reader_test_LDADD = src/libpspp-core.la
tests_libpspp_ll_test_SOURCES = \
src/libpspp/ll.c \
tests_libpspp_encoding_guesser_test_SOURCES = \
tests/libpspp/encoding-guesser-test.c
-tests_libpspp_encoding_guesser_test_LDADD = \
- src/libpspp/liblibpspp.la \
- gl/libgl.la
+tests_libpspp_encoding_guesser_test_LDADD = src/libpspp-core.la
tests_libpspp_heap_test_SOURCES = \
tests/libpspp/heap-test.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/liblibpspp.la gl/libgl.la
+tests_libpspp_i18n_test_LDADD = src/libpspp-core.la gl/libgl.la
tests_libpspp_abt_test_SOURCES = \
src/libpspp/abt.c \
tests_libpspp_str_test_SOURCES = \
tests/libpspp/str-test.c
-tests_libpspp_str_test_LDADD = src/libpspp/liblibpspp.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_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/liblibpspp.la gl/libgl.la
+tests_libpspp_stringi_map_test_LDADD = src/libpspp-core.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/liblibpspp.la gl/libgl.la
+tests_libpspp_stringi_set_test_LDADD = src/libpspp-core.la
tests_libpspp_tower_test_SOURCES = \
tests/libpspp/tower-test.c
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/liblibpspp.la gl/libgl.la
+tests_libpspp_u8_istream_test_LDADD = src/libpspp-core.la
tests_libpspp_sparse_array_test_SOURCES = \
- tests/libpspp/sparse-array-test.c
+ 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_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
tests_libpspp_sparse_xarray_test_LDADD = src/libpspp/liblibpspp.la \
src/libpspp-core.la \
- gl/libgl.la
+ gl/libgl.la
tests_data_inexactify_SOURCES = tests/data/inexactify.c
tests/language/lexer/command-name-test.c
tests_language_lexer_command_name_test_LDADD = \
src/libpspp/liblibpspp.la \
- gl/libgl.la
+ gl/libgl.la
tests_language_lexer_command_name_test_CFLAGS = $(AM_CFLAGS)
check_PROGRAMS += tests/language/lexer/scan-test
tests_language_lexer_scan_test_CFLAGS = $(AM_CFLAGS)
tests_language_lexer_scan_test_LDADD = \
src/libpspp/liblibpspp.la \
- gl/libgl.la
+ gl/libgl.la
check_PROGRAMS += tests/language/lexer/segment-test
tests_language_lexer_segment_test_SOURCES = \
tests_language_lexer_segment_test_CFLAGS = $(AM_CFLAGS)
tests_language_lexer_segment_test_LDADD = \
src/libpspp/liblibpspp.la \
- gl/libgl.la
+ gl/libgl.la
check_PROGRAMS += tests/libpspp/zip-test
tests_libpspp_zip_test_SOURCES = \
tests_libpspp_zip_test_LDADD = \
src/libpspp/liblibpspp.la \
src/libpspp-core.la \
- gl/libgl.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
src/libpspp-core.la \
$(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 = \
EXTRA_DIST += \
tests/coverage.sh \
+ tests/data/simple.ods \
+ tests/data/simple.gnumeric \
+ tests/data/sparse.ods \
+ tests/data/sparse.gnumeric \
+ tests/data/holey.ods \
+ tests/data/holey.gnumeric \
+ tests/data/multisheet.ods \
+ tests/data/multisheet.gnumeric \
+ tests/data/repeating.ods \
+ tests/data/repeating.gnumeric \
+ tests/data/one-thousand-by-fifty-three.ods \
+ tests/data/one-thousand-by-fifty-three.gnumeric \
+ 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/num-in.expected.gz \
tests/data/num-out-cmp.pl \
tests/data/num-out.expected.cmp.gz \
+ tests/data/test-date-input.py \
+ tests/data/test-time-input.py \
tests/data/v13.sav \
tests/data/v14.sav \
tests/data/test-encrypted.sps \
+ tests/data/test-decrypted.spv \
+ tests/data/test-encrypted.spv \
+ 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
+ tests/language/data-io/readnames.ods \
+ tests/language/stats/llz.zsav \
+ tests/utilities/regress.spv
CLEANFILES += *.save pspp.* foo*
\f
tests/data/data-in.at \
tests/data/data-out.at \
tests/data/datasheet-test.at \
+ tests/data/spreadsheet-test.at \
tests/data/dictionary.at \
tests/data/file.at \
tests/data/format-guesser.at \
+ tests/data/mdd-file.at \
tests/data/pc+-file-reader.at \
tests/data/por-file.at \
tests/data/sys-file-reader.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/apply.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/modify-variables.at \
tests/language/dictionary/rename-variables.at \
tests/language/dictionary/sort-variables.at \
tests/language/dictionary/split-file.at \
tests/language/utilities/cache.at \
tests/language/utilities/cd.at \
tests/language/utilities/date.at \
+ tests/language/utilities/host.at \
tests/language/utilities/insert.at \
tests/language/utilities/permissions.at \
tests/language/utilities/set.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/utilities/pspp-output.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:utilities
+DISTCLEANFILES += tests/atconfig tests/atlocal
+AUTOTEST_PATH = tests/data:tests/language/lexer:tests/libpspp:tests/output:tests/math:src/ui/terminal:utilities
$(srcdir)/tests/testsuite.at: tests/testsuite.in tests/automake.mk
- $(AM_V_GEN)cp $< $@
+ $(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])" >> $@ ;\
+ 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)
- XTERM_LOCALE='' $(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)
+$(TESTSUITE): package.m4 $(srcdir)/tests/testsuite.at $(TESTSUITE_AT)
$(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.
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/range-tower-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-convert \
- tests/valgrind/pspp
-
-$(valgrind_wrappers): tests/valgrind-wrapper.in
- @$(MKDIR_P) tests/valgrind
- $(AM_V_GEN)$(SED) -e 's,[@]wrap_program[@],$@,' \
- $(top_srcdir)/tests/valgrind-wrapper.in > $@.tmp
- $(AM_V_at)chmod +x $@.tmp
- $(AM_V_at)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)
- XTERM_LOCALE='' $(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 --suppressions=$(abs_top_srcdir)/tests/valgrind.supp --read-inline-info=yes --read-var-info=yes' TESTSUITEFLAGS='$(TESTSUITEFLAGS) -d'
@echo
@echo '--------------------------------'
@echo 'Valgrind output is in:'
@echo 'tests/testsuite.dir/*/valgrind.*'
@echo '--------------------------------'
+EXTRA_DIST += tests/valgrind.supp tests/lsan.supp