Skip to content

Commit 970994d

Browse files
committed
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
2 parents 48aa37e + 503e224 commit 970994d

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

Makefile

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2225,17 +2225,9 @@ perf: all
22252225

22262226
.PHONY: test perf
22272227

2228-
t/helper/test-ctype$X: ctype.o
2228+
t/helper/test-line-buffer$X: $(VCSSVN_LIB)
22292229

2230-
t/helper/test-date$X: date.o ctype.o
2231-
2232-
t/helper/test-delta$X: diff-delta.o patch-delta.o
2233-
2234-
t/helper/test-line-buffer$X: vcs-svn/lib.a
2235-
2236-
t/helper/test-parse-options$X: parse-options.o parse-options-cb.o
2237-
2238-
t/helper/test-svn-fe$X: vcs-svn/lib.a
2230+
t/helper/test-svn-fe$X: $(VCSSVN_LIB)
22392231

22402232
.PRECIOUS: $(TEST_OBJS)
22412233

t/test-lib.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,7 @@ then
801801
# override all git executables in TEST_DIRECTORY/..
802802
GIT_VALGRIND=$TEST_DIRECTORY/valgrind
803803
mkdir -p "$GIT_VALGRIND"/bin
804-
for file in $GIT_BUILD_DIR/git* $GIT_BUILD_DIR/test-*
804+
for file in $GIT_BUILD_DIR/git* $GIT_BUILD_DIR/t/helper/test-*
805805
do
806806
make_valgrind_symlink $file
807807
done

0 commit comments

Comments
 (0)