# [PATCH] Symlink mergetools scriptlets into valgrind wrappers 3 messages from 2011-08-30 to 2011-08-30. Participants: Thomas Rast, Jeff King. Thread: https://gitlist.dev/t/28258 ## Thomas Rast, 2011-08-30 00:47 Subject: [PATCH] Symlink mergetools scriptlets into valgrind wrappers Message-ID: URL: https://gitlist.dev/e/e11fd4c98faf1fc4f970bd1570fe931e078f436e.1314665234.git.trast%40student.ethz.ch ``` 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 --- 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 d7dfc8b..bdd9513 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 -- 1.7.7.rc0.370.gdcae57 ``` ## Thomas Rast, 2011-08-30 00:50 Subject: Re: [PATCH] Symlink mergetools scriptlets into valgrind wrappers Message-ID: <201108300250.43651.trast@student.ethz.ch> URL: https://gitlist.dev/e/201108300250.43651.trast%40student.ethz.ch In-Reply-To: ``` That's it, master is back to valgrind-clean on my box. Thanks for reading. -- Thomas Rast trast@{inf,student}.ethz.ch ``` ## Jeff King, 2011-08-30 18:16 Subject: Re: [PATCH] Symlink mergetools scriptlets into valgrind wrappers Message-ID: <20110830181620.GA18386@sigill.intra.peff.net> URL: https://gitlist.dev/e/20110830181620.GA18386%40sigill.intra.peff.net In-Reply-To: ``` On Tue, Aug 30, 2011 at 02:47:36AM +0200, Thomas Rast wrote: > 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. I'm not super-excited about special-casing like this, but I don't think there's a way to make it much cleaner without a lot of fuss. And the valgrind stuff is pretty special-cased as it is (it would probably be cleaner if it were integrated with the bin-wrappers rules in the Makefile). But it's probably not worth spending effort on it. What's there works, and your patch is a sane and straightforward fix for this new issue. So: Acked-by: Jeff King -Peff ```