diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-28 11:26:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-28 11:26:03 -0700 |
| commit | 1ecc6b291c162b9fc7b59a3251c4cbbcf3b07b84 (patch) | |
| tree | 03e3f09002e7a66e7e1a19146c66a3d72ce8936e /t | |
| parent | 6cbec0da471590a2b3de1b98795ba20f274d53fa (diff) | |
| parent | c578a09bd6310157ea69bb1d2ec2d3d2cc58c85a (diff) | |
| download | git-1ecc6b291c162b9fc7b59a3251c4cbbcf3b07b84.tar.gz git-1ecc6b291c162b9fc7b59a3251c4cbbcf3b07b84.tar.xz | |
Merge branch 'ak/lazy-prereq-mktemp' into maint
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')
| -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 76306cf26..7217f3968 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\"" && |