mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/test-helpers' into maint

Browse Source 
Update to the test framework made in 2.9 timeframe broke running
the tests under valgrind, which has been fixed.

* nd/test-helpers:
  valgrind: support test helpers
This commit is contained in:
Junio C Hamano
2016-11-29 13:28:00 -08:00
parent 6afadbd5ee 28fab7b23d
commit 91207f3784
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
t/test-lib.sh
View File

@ -809,7 +809,14 @@ then
return; return;
base=$(basename "$1") base=$(basename "$1")
symlink_target=$GIT_BUILD_DIR/$base case "$base" in
test-*)
symlink_target="$GIT_BUILD_DIR/t/helper/$base"
;;
*)
symlink_target="$GIT_BUILD_DIR/$base"
;;
esac
# do not override scripts # do not override scripts
if test -x "$symlink_target" && if test -x "$symlink_target" &&
test ! -d "$symlink_target" && test ! -d "$symlink_target" &&

12
t/valgrind/valgrind.sh
View File

@ -1,11 +1,19 @@
#!/bin/sh #!/bin/sh
base=$(basename "$0") base=$(basename "$0")
case "$base" in
test-*)
program="$GIT_VALGRIND/../../t/helper/$base"
;;
*)
program="$GIT_VALGRIND/../../$base"
;;
esac
TOOL_OPTIONS='--leak-check=no' TOOL_OPTIONS='--leak-check=no'
test -z "$GIT_VALGRIND_ENABLED" && test -z "$GIT_VALGRIND_ENABLED" &&
exec "$GIT_VALGRIND"/../../"$base" "$@" exec "$program" "$@"
case "$GIT_VALGRIND_MODE" in case "$GIT_VALGRIND_MODE" in
memcheck-fast) memcheck-fast)
@ -29,4 +37,4 @@ exec valgrind -q --error-exitcode=126 \
--log-fd=4 \ --log-fd=4 \
--input-fd=4 \ --input-fd=4 \
$GIT_VALGRIND_OPTIONS \ $GIT_VALGRIND_OPTIONS \
"$GIT_VALGRIND"/../../"$base" "$@" "$program" "$@"