From: Jeff King <peff@peff.net>
To: Thomas Rast <trast@student.ethz.ch>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, David Aguilar <davvid@gmail.com>
Subject: Re: [PATCH] Symlink mergetools scriptlets into valgrind wrappers
Date: Tue, 30 Aug 2011 14:16:20 -0400 [thread overview]
Message-ID: <20110830181620.GA18386@sigill.intra.peff.net> (raw)
In-Reply-To: <e11fd4c98faf1fc4f970bd1570fe931e078f436e.1314665234.git.trast@student.ethz.ch>
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@peff.net>
-Peff
prev parent reply other threads:[~2011-08-30 18:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-30 0:47 [PATCH] Symlink mergetools scriptlets into valgrind wrappers Thomas Rast
2011-08-30 0:50 ` Thomas Rast
2011-08-30 18:16 ` Jeff King [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110830181620.GA18386@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=trast@student.ethz.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).