=pro #15166 do not redefine executeTests

This commit is contained in:
Martynas Mickevicius 2014-05-12 15:36:49 +02:00
parent e43e48329c
commit 07ca8d5a8d
2 changed files with 43 additions and 28 deletions

View file

@ -226,14 +226,20 @@ object TestExtras {
import Keys._
private[Filter] object Params {
val testNamesExclude = systemPropertyAsSeq("akka.test.names.exclude").toSet
val testTagsExlcude = systemPropertyAsSeq("akka.test.tags.exclude").toSet
val testTagsOnly = systemPropertyAsSeq("akka.test.tags.only").toSet
}
def settings = {
Seq(
excludeTestNames := systemPropertyAsSeq("akka.test.names.exclude").toSet,
excludeTestNames := Params.testNamesExclude,
excludeTestTags := {
if (onlyTestTags.value.isEmpty) systemPropertyAsSeq("akka.test.tags.exclude").toSet
if (onlyTestTags.value.isEmpty) Params.testTagsExlcude
else Set.empty
},
onlyTestTags := systemPropertyAsSeq("akka.test.tags.only").toSet,
onlyTestTags := Params.testTagsOnly,
// add filters for tests excluded by name
testOptions in Test <++= excludeTestNames map { _.toSeq.map(exclude => Tests.Filter(test => !test.contains(exclude))) },
@ -250,6 +256,10 @@ object TestExtras {
)
}
def containsOrNotExcludesTag(tag: String) = {
Params.testTagsOnly.contains(tag) || !Params.testTagsExlcude(tag)
}
def systemPropertyAsSeq(name: String): Seq[String] = {
val prop = sys.props.get(name).getOrElse("")
if (prop.isEmpty) Seq.empty else prop.split(",").toSeq