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

diff --git a/tests/automake.mk b/tests/automake.mk
index 484ef0e1..a6d8de3a 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -384,6 +384,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 +395,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 +418,27 @@ $(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/pspp \
+	tests/valgrind/render-test
+
+$(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 '--------------------------------'