diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:46:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:46:37 -0700 |
| commit | 8f858299b585e4be0648432a78a94b0260b3ad86 (patch) | |
| tree | 45190cf2d0e0109fdf6126fde597512b9eff2d88 /t | |
| parent | 7c4f050ae1e140a81f66b5cf92ad2c8673cfda8b (diff) | |
| parent | ee0d7bf92507f7c968736a490813e8d9cd7792b1 (diff) | |
| download | git-8f858299b585e4be0648432a78a94b0260b3ad86.tar.gz git-8f858299b585e4be0648432a78a94b0260b3ad86.tar.xz | |
Merge branch 'tr/mergetool-valgrind' into maint
* tr/mergetool-valgrind:
Symlink mergetools scriptlets into valgrind wrappers
Diffstat (limited to 't')
| -rw-r--r-- | t/test-lib.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index d7dfc8b0b..bdd9513b8 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -950,6 +950,8 @@ then do make_valgrind_symlink $file done + # special-case the mergetools loadables + make_symlink "$GIT_BUILD_DIR"/mergetools "$GIT_VALGRIND/bin/mergetools" OLDIFS=$IFS IFS=: for path in $PATH |