From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Armin Kunaschik <megabreit@googlemail.com>,
Git List <git@vger.kernel.org>
Subject: Re: t7610-mergetool.sh test failure
Date: Wed, 25 May 2016 20:51:14 -0500 [thread overview]
Message-ID: <20160526015114.GA12851@sigill.intra.peff.net> (raw)
In-Reply-To: <20160525231615.GC2634@sigill.intra.peff.net>
On Wed, May 25, 2016 at 06:16:15PM -0500, Jeff King wrote:
> 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
next prev parent reply other threads:[~2016-05-26 1:51 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-24 16:44 t7610-mergetool.sh test failure Armin Kunaschik
2016-05-24 16:45 ` Junio C Hamano
2016-05-24 16:53 ` Armin Kunaschik
2016-05-25 23:16 ` Jeff King
2016-05-26 1:51 ` Jeff King [this message]
2016-05-27 4:40 ` David Aguilar
2016-05-27 5:00 ` Jeff King
2016-05-27 6:33 ` Junio C Hamano
2016-05-27 18:24 ` Jeff King
2016-05-27 19:58 ` Junio C Hamano
2016-05-27 20:01 ` Jeff King
2016-06-22 16:53 ` Armin Kunaschik
2016-06-22 17:12 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160526015114.GA12851@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=megabreit@googlemail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).