Merge branch 'ee/clean-remove-dirs'

gitster · gitster · commit b590720f2cd3 · 2015-08-25T14:57:06.000-07:00
Test updates for Windows.

* ee/clean-remove-dirs:
  t7300-clean: require POSIXPERM for chmod 0 test
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
@@ -499,7 +499,7 @@ test_expect_success 'should not clean submodules' '
 	test_path_is_missing to_clean
 '
 
-test_expect_success 'should avoid cleaning possible submodules' '
+test_expect_success POSIXPERM 'should avoid cleaning possible submodules' '
 	rm -fr to_clean possible_sub1 &&
 	mkdir to_clean possible_sub1 &&
 	test_when_finished "rm -rf possible_sub*" &&

Original file line number	Diff line number	Diff line change
`@@ -499,7 +499,7 @@ test_expect_success 'should not clean submodules' '`
`499`	`499`	`test_path_is_missing to_clean`
`500`	`500`	`'`
`501`	`501`
`502`		`-test_expect_success 'should avoid cleaning possible submodules' '`
	`502`	`+test_expect_success POSIXPERM 'should avoid cleaning possible submodules' '`
`503`	`503`	`rm -fr to_clean possible_sub1 &&`
`504`	`504`	`mkdir to_clean possible_sub1 &&`
`505`	`505`	`test_when_finished "rm -rf possible_sub*" &&`