From: Junio C Hamano <gitster@pobox.com>
To: Armin Kunaschik <megabreit@googlemail.com>
Cc: Git List <git@vger.kernel.org>, Jeff King <peff@peff.net>
Subject: Re: [PATCH] t7610 test for mktemp existence
Date: Wed, 06 Jul 2016 11:23:51 -0700 [thread overview]
Message-ID: <xmqqr3b6sk08.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <57780F9F.3050802@googlemail.com> (Armin Kunaschik's message of "Sat, 2 Jul 2016 21:01:51 +0200")
Armin Kunaschik <megabreit@googlemail.com> writes:
> Subject: t7610: test for mktemp before test execution
>
> mktemp is not available on all platforms, so the test
> 'temporary filenames are used with mergetool.writeToTemp'
> fails there.
> This patch does not replace mktemp but just disables
> the test that otherwise would fail.
> mergetool checks itself before executing mktemp and
> reports an error.
Thanks.
> Signed-off-by: Armin Kunaschik <megabreit@googlemail.com>
>
> ---
>
> diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
> index 76306cf..9279bf5 100755
> --- a/t/t7610-mergetool.sh
> +++ b/t/t7610-mergetool.sh
> @@ -589,7 +589,12 @@ test_expect_success 'filenames seen by tools start with ./' '
> git reset --hard master >/dev/null 2>&1
> '
>
> -test_expect_success 'temporary filenames are used with mergetool.writeToTemp' '
> +test_lazy_prereq MKTEMP '
> + tempdir=$(mktemp -d -t foo.XXX) &&
> + test -d "$tempdir"
> +'
This makes me wonder what would happen to the leftover directory,
though. Would it be a better idea to clean it up as well, i.e.
tempdir=$(mktemp -d -t foo.XXXXXX) &&
test -d "$tempdir" &&
rmdir "$tempdir"
next prev parent reply other threads:[~2016-07-06 18:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-02 19:01 [PATCH] t7610 test for mktemp existence Armin Kunaschik
2016-07-06 18:23 ` Junio C Hamano [this message]
2016-07-06 19:01 ` Jeff King
2016-07-06 19:15 ` Junio C Hamano
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=xmqqr3b6sk08.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=megabreit@googlemail.com \
--cc=peff@peff.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.