aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-08 14:21:43 -0700
committerJunio C Hamano <gitster@pobox.com>2016-08-08 14:21:43 -0700
commit970994deb1179300c73af14928156f30f78b0117 (patch)
treed4af7ff20405ee3ab2c68e2829e4f9566a73ce28
parent48aa37ed4266e75340abd3232860d6d14a30c774 (diff)
parent503e22418082d1ec616ec98ab90c6a73cd3ef96f (diff)
downloadgit-970994deb1179300c73af14928156f30f78b0117.tar.gz
git-970994deb1179300c73af14928156f30f78b0117.tar.xz
Merge branch 'nd/test-helpers' into maint
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
-rw-r--r--Makefile12
-rw-r--r--t/test-lib.sh2
2 files changed, 3 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index de5a03025..4579eab43 100644
--- a/Makefile
+++ b/Makefile
@@ -2225,17 +2225,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 2e5afd696..d731d66e3 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -801,7 +801,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