tests/libpspp/tower-test \
tests/libpspp/u8-istream-test \
tests/libpspp/zip-test \
- tests/math/chart-geometry-test \
+ tests/math/chart-get-ticks-format-test \
tests/math/chart-get-scale-test \
- tests/math/decimal-test \
tests/output/render-test \
tests/ui/syntax-gen-test
src/libpspp-core.la \
gl/libgl.la
-check_PROGRAMS += tests/math/chart-geometry-test
-tests_math_chart_geometry_test_SOURCES = tests/math/chart-geometry-test.c
-tests_math_chart_geometry_test_LDADD = \
- src/math/libpspp-math.la \
- 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/libpspp-core.la \
gl/libgl.la
-check_PROGRAMS += tests/math/decimal-test
-tests_math_decimal_test_SOURCES = tests/math/decimal-test.c
-tests_math_decimal_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 = \
tests/data/num-out.expected.cmp.gz \
tests/data/v13.sav \
tests/data/v14.sav \
+ 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/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/sys-file-encryption.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/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/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/libpspp/u8-istream.at \
tests/libpspp/zip.at \
tests/math/chart-geometry.at \
- tests/math/decimal.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/perl-module.at
TESTSUITE = $(srcdir)/tests/testsuite
-DISTCLEANFILES += tests/atconfig tests/atlocal $(TESTSUITE)
+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
- $(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)
- $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' $@.at | sed 's/@<00A0>@/ /g' > $@.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.
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' TESTSUITEFLAGS='$(TESTSUITEFLAGS) -d'
@echo
@echo '--------------------------------'
@echo 'Valgrind output is in:'