Merge branch 'ak/lazy-prereq-mktemp'

Test code clean-up. * ak/lazy-prereq-mktemp: t7610: clean up foo.XXXXXX tmpdir
8 years ago · eb600866c3
1 changed files with 2 additions and 1 deletions
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@ -591,7 +591,8 @@ test_expect_success 'filenames seen by tools start with ./' '
				@@ -591,7 +591,8 @@ test_expect_success 'filenames seen by tools start with ./' '

 test_lazy_prereq MKTEMP '
 	tempdir=$(mktemp -d -t foo.XXXXXX) &&
-	test -d "$tempdir"
+	test -d "$tempdir" &&
+	rmdir "$tempdir"
 '

 test_expect_success MKTEMP 'temporary filenames are used with mergetool.writeToTemp' '