Re: [PATCH] t7610 test for mktemp existence

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 6, 2016, 18:23 UTC
Message-ID: <xmqqr3b6sk08.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <57780F9F.3050802@googlemail.com>

Armin Kunaschik <megabreit@googlemail.com> writes:

Show 9 quoted lines

> 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.

Show 17 quoted lines

> 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"