Andrew's git / gitweb.git / diff
?
Merge branch 'jc/clean-after-sanity-tests'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Jun 2018 19:53:33 +0000 (12:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Jun 2018 19:53:33 +0000 (12:53 -0700)
test cleanup.

* jc/clean-after-sanity-tests:
tests: clean after SANITY tests

1  2 
t/t0070-fundamental.sh patch | diff1 | diff2 | blob | history
t/t7508-status.sh patch | diff1 | diff2 | blob | history
diff --cc t/t0070-fundamental.sh
index 23fbe6434abd3f05057d4916f70e5d5b30115b68,60e3de7b7b39a5ac7989062164fc8e33a0403b20..7b111a56fdd3e13d34b538e52c2659a8f2e188a2
--- 1/t/t0070-fundamental.sh
--- 2/t/t0070-fundamental.sh
+++ b/t/t0070-fundamental.sh
@@@ -19,9 -19,9 +19,9 @@@ test_expect_success 'mktemp to nonexist
  
  test_expect_success POSIXPERM,SANITY 'mktemp to unwritable directory prints filename' '
        mkdir cannotwrite &&
-       chmod -w cannotwrite &&
        test_when_finished "chmod +w cannotwrite" &&
 -      test_must_fail test-mktemp cannotwrite/testXXXXXX 2>err &&
+       chmod -w cannotwrite &&
 +      test_must_fail test-tool mktemp cannotwrite/testXXXXXX 2>err &&
        grep "cannotwrite/test" err
  '
  
diff --cc t/t7508-status.sh
Simple merge