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>
Thomas Rast committed
Aug 30, 2011 at 02:47 UTC
ee0d7bf92507f7c968736a490813e8d9cd7792b1
1 file changed
+2
t/test-lib.sh
+2
@@ -932,6 +932,8 @@ then
932
do
933
make_valgrind_symlink $file
934
done
935
+ # special-case the mergetools loadables
936
+ make_symlink "$GIT_BUILD_DIR"/mergetools "$GIT_VALGRIND/bin/mergetools"
937
OLDIFS=$IFS
938
IFS=:
939
for path in $PATH