Re: t7610-mergetool.sh test failure

From: Jeff King <peff@peff.net>
Date: May 26, 2016, 01:51 UTC
Message-ID: <20160526015114.GA12851@sigill.intra.peff.net>
In-Reply-To: <20160525231615.GC2634@sigill.intra.peff.net>

On Wed, May 25, 2016 at 06:16:15PM -0500, Jeff King wrote:

Show 21 quoted lines

> On Tue, May 24, 2016 at 09:45:25AM -0700, Junio C Hamano wrote:
> 
> > On Tue, May 24, 2016 at 9:44 AM, Armin Kunaschik
> > <megabreit@googlemail.com> wrote:
> > > t7610-mergetool.sh fails on systems without mktemp.
> > >
> > > mktemp is used in git-mergetool.sh and throws an error when it's not available.
> > > error: mktemp is needed when 'mergetool.writeToTemp' is true
> > >
> > > I see 2 options:
> > > 1. code around it, write an own mktemp, maybe use the test-mktemp as a basis.
> > > 2. disable the test when mktemp is not available
> > 
> > 3. find and install mktemp?
> 
> I'd agree more with (3) if it was some critical part of git-mergetool.
> But it seems to be a completely optional feature that we use in only one
> place, and git-mergetool even detects this case and complains.
> 
> So another alternative would be for the test to detect either that
> mergetool worked, or that we got the "mktemp is needed" error.

BTW, one thing I happened to note while looking at this: running the test script will write into /tmp (or wherever your $TMPDIR points). Probably not a big deal, but I wonder if we should be setting $TMPDIR in our test harness.

-Peff