git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents

diff --git a/t/Makefile b/t/Makefile
index e544493d1053c6e7c01d492b748b8b762c2327d3..bd09390d3208d7eac362cd9cf45f7dde623c4ae6 100644 (file)
--- a/t/Makefile
+++ b/t/Makefile
@@ -3,6 +3,8 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
+-include ../config.mak
+
 #GIT_TEST_OPTS=--verbose --debug
 SHELL_PATH ?= $(SHELL)
 TAR ?= $(TAR)
@@ -24,7 +26,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
@@ -39,6 +41,6 @@ full-svn-test:
        $(MAKE) $(TSVN) GIT_SVN_NO_OPTIMIZE_COMMITS=0 LC_ALL=en_US.UTF-8
 
 valgrind:
-       GIT_TEST_OPTS='--valgrind -v --tee' $(MAKE) -k
+       GIT_TEST_OPTS=--valgrind $(MAKE)
 
 .PHONY: pre-clean $(T) aggregate-results clean valgrind