diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-07-19 13:22:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-19 13:22:18 -0700 |
| commit | df9da64a7c2aee12fd967cb9ff1730312d4b271d (patch) | |
| tree | dbb7256b2de3788e5db859660771292bf47172ae /t/t7610-mergetool.sh | |
| parent | Merge branch 'nd/icase' (diff) | |
| parent | t7610: test for mktemp before test execution (diff) | |
| download | tgif-df9da64a7c2aee12fd967cb9ff1730312d4b271d.tar.xz | |
Merge branch 'ak/lazy-prereq-mktemp'
A test that unconditionally used "mktemp" learned that the command
is not necessarily available everywhere.
* ak/lazy-prereq-mktemp:
t7610: test for mktemp before test execution
Diffstat (limited to 't/t7610-mergetool.sh')
| -rwxr-xr-x | t/t7610-mergetool.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index 76306cf268..7217f3968d 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.XXXXXX) && + test -d "$tempdir" +' + +test_expect_success MKTEMP 'temporary filenames are used with mergetool.writeToTemp' ' git checkout -b test16 branch1 && test_config mergetool.writeToTemp true && test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" && |