X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=d62ef6379f071ff2df804d0df80acd0f17f45cb9;hb=ef893065568975efb51739ad2086c4d50ec6f867;hp=484ef0e11c67647e08b5bab59edf4dccdad667b1;hpb=afdf3096926b561f4e6511c10fcf73fc6796b9d2;p=pspp

diff --git a/tests/automake.mk b/tests/automake.mk
index 484ef0e11c..d62ef6379f 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -293,6 +293,7 @@ TESTSUITE_AT = \
 	tests/language/data-io/add-files.at \
 	tests/language/data-io/data-list.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-psql.at \
@@ -307,6 +308,7 @@ TESTSUITE_AT = \
 	tests/language/data-io/save-translate.at \
 	tests/language/data-io/update.at \
 	tests/language/dictionary/attributes.at \
+	tests/language/dictionary/formats.at \
 	tests/language/dictionary/missing-values.at \
 	tests/language/dictionary/mrsets.at \
 	tests/language/dictionary/rename-variables.at \
@@ -335,6 +337,7 @@ TESTSUITE_AT = \
 	tests/language/stats/frequencies.at \
 	tests/language/stats/npar.at \
 	tests/language/stats/oneway.at \
+	tests/language/stats/quick-cluster.at \
 	tests/language/stats/rank.at \
 	tests/language/stats/regression.at \
 	tests/language/stats/reliability.at \
@@ -375,6 +378,7 @@ TESTSUITE_AT = \
 	tests/libpspp/u8-istream.at \
 	tests/math/moments.at \
 	tests/math/randist.at \
+	tests/output/ascii.at \
 	tests/output/charts.at \
 	tests/output/output.at \
 	tests/output/paper-size.at \
@@ -384,6 +388,7 @@ TESTSUITE_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
 
 $(srcdir)/tests/testsuite.at: tests/testsuite.in tests/automake.mk
 	cp $< $@
@@ -394,7 +399,7 @@ EXTRA_DIST += tests/testsuite.at
 
 CHECK_LOCAL += tests_check
 tests_check: tests/atconfig tests/atlocal $(TESTSUITE) $(check_PROGRAMS)
-	$(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=tests/data:tests/language/lexer:tests/libpspp:tests/output:src/ui/terminal $(TESTSUITEFLAGS)
+	$(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) $(TESTSUITEFLAGS)
 
 CLEAN_LOCAL += tests_clean
 tests_clean:
@@ -417,3 +422,51 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
 	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])' && \
 	  echo 'm4_define([AT_PACKAGE_URL],       [$(PACKAGE_URL)])'; \
 	} >'$(srcdir)/package.m4'
+
+# 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)
+	@echo
+	@echo '--------------------------------'
+	@echo 'Valgrind output is in:'
+	@echo 'tests/testsuite.dir/*/valgrind.*'
+	@echo '--------------------------------'