undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/test-helpers' into maint

Browse Source 
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
This commit is contained in:
Junio C Hamano 2016-08-08 14:21:43 -07:00
commit 970994deb1
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -2225,17 +2225,9 @@ perf: all
.PHONY: test perf .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-svn-fe$X: $(VCSSVN_LIB)
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
.PRECIOUS: $(TEST_OBJS) .PRECIOUS: $(TEST_OBJS)

2
t/test-lib.sh
View File

@ -801,7 +801,7 @@ then
# override all git executables in TEST_DIRECTORY/.. # override all git executables in TEST_DIRECTORY/..
GIT_VALGRIND=$TEST_DIRECTORY/valgrind GIT_VALGRIND=$TEST_DIRECTORY/valgrind
mkdir -p "$GIT_VALGRIND"/bin 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 do
make_valgrind_symlink $file make_valgrind_symlink $file
done done