Merge branch 'sb/clean-test-fix' into HEAD

gitster · gitster · commit 10b6646afcf5 · 2016-05-18T14:40:14.000-07:00
* sb/clean-test-fix:
  t7300: mark test with SANITY
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
@@ -495,7 +495,7 @@ test_expect_success 'should not clean submodules' '
 	test_path_is_missing to_clean
 '
 
-test_expect_success POSIXPERM 'should avoid cleaning possible submodules' '
+test_expect_success POSIXPERM,SANITY '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
`@@ -495,7 +495,7 @@ test_expect_success 'should not clean submodules' '`
`495`	`495`	`test_path_is_missing to_clean`
`496`	`496`	`'`
`497`	`497`
`498`		`-test_expect_success POSIXPERM 'should avoid cleaning possible submodules' '`
	`498`	`+test_expect_success POSIXPERM,SANITY 'should avoid cleaning possible submodules' '`
`499`	`499`	`rm -fr to_clean possible_sub1 &&`
`500`	`500`	`mkdir to_clean possible_sub1 &&`
`501`	`501`	`test_when_finished "rm -rf possible_sub*" &&`