Totally skip running multi-jvm tests when long-running is excluded, see #2194
This commit is contained in:
parent
e8e0ef83bb
commit
9ca794dcc8
2 changed files with 11 additions and 5 deletions
|
|
@ -21,7 +21,7 @@ object ClusterSpec {
|
|||
}
|
||||
akka.actor.provider = "akka.remote.RemoteActorRefProvider"
|
||||
akka.remote.netty.port = 0
|
||||
akka.loglevel = DEBUG
|
||||
# akka.loglevel = DEBUG
|
||||
"""
|
||||
|
||||
case class GossipTo(address: Address)
|
||||
|
|
|
|||
|
|
@ -338,6 +338,11 @@ object AkkaBuild extends Build {
|
|||
// for running only tests by tag use system property: -Dakka.test.tags.only=<tag name>
|
||||
lazy val useOnlyTestTags: Set[String] = systemPropertyAsSeq("akka.test.tags.only").toSet
|
||||
|
||||
def executeMultiJvmTests: Boolean = {
|
||||
useOnlyTestTags.contains("long-running") ||
|
||||
!(useExcludeTestTags -- useIncludeTestTags).contains("long-running")
|
||||
}
|
||||
|
||||
def systemPropertyAsSeq(name: String): Seq[String] = {
|
||||
val prop = System.getProperty(name, "")
|
||||
if (prop.isEmpty) Seq.empty else prop.split(",").toSeq
|
||||
|
|
@ -402,20 +407,21 @@ object AkkaBuild extends Build {
|
|||
|
||||
lazy val multiJvmSettings = MultiJvmPlugin.settings ++ inConfig(MultiJvm)(ScalariformPlugin.scalariformSettings) ++ Seq(
|
||||
compileInputs in MultiJvm <<= (compileInputs in MultiJvm) dependsOn (ScalariformKeys.format in MultiJvm),
|
||||
ScalariformKeys.preferences in MultiJvm := formattingPreferences,
|
||||
if (multiNodeEnabled)
|
||||
ScalariformKeys.preferences in MultiJvm := formattingPreferences) ++
|
||||
(if (multiNodeEnabled)
|
||||
executeTests in Test <<= ((executeTests in Test), (multiNodeExecuteTests in MultiJvm)) map {
|
||||
case (tr, mr) =>
|
||||
val r = tr._2 ++ mr._2
|
||||
(Tests.overall(r.values), r)
|
||||
}
|
||||
else
|
||||
else if (executeMultiJvmTests)
|
||||
executeTests in Test <<= ((executeTests in Test), (executeTests in MultiJvm)) map {
|
||||
case (tr, mr) =>
|
||||
val r = tr._2 ++ mr._2
|
||||
(Tests.overall(r.values), r)
|
||||
}
|
||||
)
|
||||
else Seq.empty)
|
||||
|
||||
|
||||
lazy val mimaSettings = mimaDefaultSettings ++ Seq(
|
||||
// MiMa
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue