Merge branch 'maint'

diff --git a/t/Makefile b/t/Makefile
index ed49c20b16b520da1b460960dbadd5d31c4927ba..bf816fc8505508c91999175ad6544a67febabb33 100644 (file)
--- a/t/Makefile
+++ b/t/Makefile
@@ -24,7 +24,7 @@ pre-clean:
        $(RM) -r test-results
 
 clean:
-       $(RM) -r 'trash directory' test-results
+       $(RM) -r 'trash directory'.* test-results
 
 aggregate-results-and-cleanup: $(T)
        $(MAKE) aggregate-results
@@ -38,4 +38,7 @@ full-svn-test:
        $(MAKE) $(TSVN) GIT_SVN_NO_OPTIMIZE_COMMITS=1 LC_ALL=C
        $(MAKE) $(TSVN) GIT_SVN_NO_OPTIMIZE_COMMITS=0 LC_ALL=en_US.UTF-8
 
-.PHONY: pre-clean $(T) aggregate-results clean
+valgrind:
+       GIT_TEST_OPTS=--valgrind $(MAKE)
+
+.PHONY: pre-clean $(T) aggregate-results clean valgrind