{"thread":{"id":"28258","subject":"[PATCH] Symlink mergetools scriptlets into valgrind wrappers","startedAt":"2011-08-30T00:47:36Z","lastAt":"2011-08-30T18:16:20Z","messageCount":3,"participants":["Thomas Rast","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"174526","messageId":"e11fd4c98faf1fc4f970bd1570fe931e078f436e.1314665234.git.trast@student.ethz.ch","threadId":"28258","inReplyTo":null,"subject":"[PATCH] Symlink mergetools scriptlets into valgrind wrappers","fromName":"Thomas Rast","fromEmail":"trast@student.ethz.ch","sentAt":"2011-08-30T00:47:36Z","receivedAt":"2011-08-30T00:47:36Z","isPatch":true,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"Since bc7a96a (mergetool--lib: Refactor tools into separate files,\n2011-08-18) the mergetools and difftools related tests fail under\n--valgrind because the mergetools/* scriptlets are not in the exec\npath.\n\nFor now, symlink the mergetools subdir into the t/valgrind/bin\ndirectory as a whole, since it does not contain anything of interest\nto the valgrind wrappers.\n\nSigned-off-by: Thomas Rast <trast@student.ethz.ch>\n---\n t/test-lib.sh |    2 ++\n 1 files changed, 2 insertions(+), 0 deletions(-)\n\ndiff --git a/t/test-lib.sh b/t/test-lib.sh\nindex d7dfc8b..bdd9513 100644\n--- a/t/test-lib.sh\n+++ b/t/test-lib.sh\n@@ -950,6 +950,8 @@ then\n \tdo\n \t\tmake_valgrind_symlink $file\n \tdone\n+\t# special-case the mergetools loadables\n+\tmake_symlink \"$GIT_BUILD_DIR\"/mergetools \"$GIT_VALGRIND/bin/mergetools\"\n \tOLDIFS=$IFS\n \tIFS=:\n \tfor path in $PATH\n-- \n1.7.7.rc0.370.gdcae57\n"},{"id":"174527","messageId":"201108300250.43651.trast@student.ethz.ch","threadId":"28258","inReplyTo":"e11fd4c98faf1fc4f970bd1570fe931e078f436e.1314665234.git.trast@student.ethz.ch","subject":"Re: [PATCH] Symlink mergetools scriptlets into valgrind wrappers","fromName":"Thomas Rast","fromEmail":"trast@student.ethz.ch","sentAt":"2011-08-30T00:50:42Z","receivedAt":"2011-08-30T00:50:42Z","isPatch":true,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"That's it, master is back to valgrind-clean on my box.  Thanks for\nreading.\n\n-- \nThomas Rast\ntrast@{inf,student}.ethz.ch\n"},{"id":"174571","messageId":"20110830181620.GA18386@sigill.intra.peff.net","threadId":"28258","inReplyTo":"e11fd4c98faf1fc4f970bd1570fe931e078f436e.1314665234.git.trast@student.ethz.ch","subject":"Re: [PATCH] Symlink mergetools scriptlets into valgrind wrappers","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2011-08-30T18:16:20Z","receivedAt":"2011-08-30T18:16:20Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Aug 30, 2011 at 02:47:36AM +0200, Thomas Rast wrote:\n\n> Since bc7a96a (mergetool--lib: Refactor tools into separate files,\n> 2011-08-18) the mergetools and difftools related tests fail under\n> --valgrind because the mergetools/* scriptlets are not in the exec\n> path.\n> \n> For now, symlink the mergetools subdir into the t/valgrind/bin\n> directory as a whole, since it does not contain anything of interest\n> to the valgrind wrappers.\n\nI'm not super-excited about special-casing like this, but I don't think\nthere's a way to make it much cleaner without a lot of fuss. And the\nvalgrind stuff is pretty special-cased as it is (it would probably be\ncleaner if it were integrated with the bin-wrappers rules in the\nMakefile). But it's probably not worth spending effort on it. What's\nthere works, and your patch is a sane and straightforward fix for this\nnew issue. So:\n\nAcked-by: Jeff King <peff@peff.net>\n\n-Peff\n"}]}