Merge branch 'nd/test-helpers'

Build clean-up.

* nd/test-helpers:
t/test-lib.sh: fix running tests with --valgrind
Makefile: use VCSSVN_LIB to refer to svn library
Makefile: drop extra dependencies for test helpers

diff --git a/Makefile b/Makefile
index 1978cb8d40b578648c05fbcfd783f9dbf2178abb..6a13386c27336b0f3054389674872a2c842f3290 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2245,17 +2245,9 @@ perf: all
 
 .PHONY: test perf
 
-t/helper/test-ctype$X: ctype.o
+t/helper/test-line-buffer$X: $(VCSSVN_LIB)
 
-t/helper/test-date$X: date.o ctype.o
-
-t/helper/test-delta$X: diff-delta.o patch-delta.o
-
-t/helper/test-line-buffer$X: vcs-svn/lib.a
-
-t/helper/test-parse-options$X: parse-options.o parse-options-cb.o
-
-t/helper/test-svn-fe$X: vcs-svn/lib.a
+t/helper/test-svn-fe$X: $(VCSSVN_LIB)
 
 .PRECIOUS: $(TEST_OBJS)
 

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 11201e9cf8320a0f90e4848d8bfe4ccd2ba92c88..3f8b98b2c54e1afdb0da42fe3de9fa5ab3f59df3 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -798,7 +798,7 @@ then
        # override all git executables in TEST_DIRECTORY/..
        GIT_VALGRIND=$TEST_DIRECTORY/valgrind
        mkdir -p "$GIT_VALGRIND"/bin
-       for file in $GIT_BUILD_DIR/git* $GIT_BUILD_DIR/test-*
+       for file in $GIT_BUILD_DIR/git* $GIT_BUILD_DIR/t/helper/test-*
        do
                make_valgrind_symlink $file
        done