Merge pull request scala#77 from martijnhoekstra/haltonbadfile

adriaanm · web-flow · commit cd9319f38050 · 2017-04-10T14:29:21.000-07:00
dont run all tests if there are invalid tests
diff --git a/src/partest/scala/tools/partest/nest/AbstractRunner.scala b/src/partest/scala/tools/partest/nest/AbstractRunner.scala
@@ -142,7 +142,7 @@ abstract class AbstractRunner {
       val givenKinds = standardKinds filter config.parsed.isSet
       val kinds = (
         if (givenKinds.nonEmpty) givenKinds
-        else if (miscTests.isEmpty) standardKinds // If no kinds, --grep, or individual tests were given, assume --all
+        else if (miscTests.isEmpty && invalid.isEmpty) standardKinds // If no kinds, --grep, or individual tests were given, assume --all, unless there were invalid files specified
         else Nil
       )
       val kindsTests = kinds flatMap testsFor

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ abstract class AbstractRunner {`
`142`	`142`	`val givenKinds = standardKinds filter config.parsed.isSet`
`143`	`143`	`val kinds = (`
`144`	`144`	`if (givenKinds.nonEmpty) givenKinds`
`145`		`- else if (miscTests.isEmpty) standardKinds // If no kinds, --grep, or individual tests were given, assume --all`
	`145`	`+ else if (miscTests.isEmpty && invalid.isEmpty) standardKinds // If no kinds, --grep, or individual tests were given, assume --all, unless there were invalid files specified`
`146`	`146`	`else Nil`
`147`	`147`	`)`
`148`	`148`	`val kindsTests = kinds flatMap testsFor`