diff options
| author |  Thomas Rast <trast@student.ethz.ch> | 2011-08-30 02:47:36 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-30 12:27:01 -0700 |
| commit | ee0d7bf92507f7c968736a490813e8d9cd7792b1 (patch) | |
| tree | e9dfe82f7b9855f09037a4e63486fac03ca88f28 | |
| parent | Merge branch 'da/difftool-mergtool-refactor' (diff) | |
| download | tgif-ee0d7bf92507f7c968736a490813e8d9cd7792b1.tar.xz | |
Symlink mergetools scriptlets into valgrind wrappers
Since bc7a96a (mergetool--lib: Refactor tools into separate files,
2011-08-18) the mergetools and difftools related tests fail under
--valgrind because the mergetools/* scriptlets are not in the exec
path.
For now, symlink the mergetools subdir into the t/valgrind/bin
directory as a whole, since it does not contain anything of interest
to the valgrind wrappers.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 e27422217d..c210c17c29 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -932,6 +932,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 |