Merge branch 'rs/threaded-grep-context'

diff --git a/t/Makefile b/t/Makefile
index bf816fc8505508c91999175ad6544a67febabb33..25c559bb49d04586c69242cd7ef03713f0939e9d 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)
@@ -25,6 +27,8 @@ pre-clean:
 
 clean:
        $(RM) -r 'trash directory'.* test-results
+       $(RM) t????/cvsroot/CVSROOT/?*
+       $(RM) -r valgrind/bin
 
 aggregate-results-and-cleanup: $(T)
        $(MAKE) aggregate-results