Re: [PATCH] Symlink mergetools scriptlets into valgrind wrappers
- From
Jeff King <peff@peff.net>
- Date
- Aug 30, 2011, 18:16 UTC
- Message-ID
- <20110830181620.GA18386@sigill.intra.peff.net>
- In-Reply-To
- <e11fd4c98faf1fc4f970bd1570fe931e078f436e.1314665234.git.trast@student.ethz.ch>
On Tue, Aug 30, 2011 at 02:47:36AM +0200, Thomas Rast wrote:
Show 8 quoted lines
> 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@peff.net>
-Peff