Merge branch 'tr/mergetool-valgrind' into maint

* tr/mergetool-valgrind: Symlink mergetools scriptlets into valgrind wrappers
2024-08-28 12:09:19 +00:00 · 2011-10-15 20:46:37 -07:00 · 2011-10-15 20:46:37 -07:00 · 8f858299b5
parent 7c4f050ae1 ee0d7bf925
commit 8f858299b5
1 changed files with 2 additions and 0 deletions
--- 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