raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Merge pull request #27653 from akka/wip-27652-assembly-patriknw

Browse source 
assemblyMergeStrategy first for logback-test.xml, #27652
This commit is contained in:
Patrik Nordwall 2019-09-06 17:51:30 +02:00 • committed by GitHub
commit f14acf7de8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 70 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

38
project/MultiNode.scala
View file

@ -12,6 +12,8 @@ import sbt.{ Def, _ }
import sbt.Keys._ import sbt.Keys._
import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._ import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._
import org.scalafmt.sbt.ScalafmtPlugin.scalafmtConfigSettings import org.scalafmt.sbt.ScalafmtPlugin.scalafmtConfigSettings
import sbtassembly.MergeStrategy
import sbtassembly.AssemblyKeys._
object MultiNode extends AutoPlugin { object MultiNode extends AutoPlugin {
@ -34,7 +36,8 @@ object MultiNode extends AutoPlugin {
val targetDirName = sys.props.get("akka.test.multi-node.targetDirName").toSeq val targetDirName = sys.props.get("akka.test.multi-node.targetDirName").toSeq
} }
val multiExecuteTests = CliOptions.multiNode.ifTrue(multiNodeExecuteTests in MultiJvm).getOrElse(executeTests in MultiJvm) val multiExecuteTests =
CliOptions.multiNode.ifTrue(multiNodeExecuteTests in MultiJvm).getOrElse(executeTests in MultiJvm)
val multiTest = CliOptions.multiNode.ifTrue(multiNodeTest in MultiJvm).getOrElse(test in MultiJvm) val multiTest = CliOptions.multiNode.ifTrue(multiNodeTest in MultiJvm).getOrElse(test in MultiJvm)
override def trigger = noTrigger override def trigger = noTrigger
@ -60,9 +63,7 @@ object MultiNode extends AutoPlugin {
"-Xmx256m" :: akkaProperties ::: CliOptions.sbtLogNoFormat.ifTrue("-Dakka.test.nocolor=true").toList "-Xmx256m" :: akkaProperties ::: CliOptions.sbtLogNoFormat.ifTrue("-Dakka.test.nocolor=true").toList
} }
private val anyConfigsInThisProject = ScopeFilter( private val anyConfigsInThisProject = ScopeFilter(configurations = inAnyConfiguration)
configurations = inAnyConfiguration
)
private val multiJvmSettings = private val multiJvmSettings =
SbtMultiJvm.multiJvmSettings ++ SbtMultiJvm.multiJvmSettings ++
@ -73,6 +74,10 @@ object MultiNode extends AutoPlugin {
jvmOptions in MultiJvm := defaultMultiJvmOptions, jvmOptions in MultiJvm := defaultMultiJvmOptions,
scalacOptions in MultiJvm := (scalacOptions in Test).value, scalacOptions in MultiJvm := (scalacOptions in Test).value,
logLevel in multiJvmCreateLogger := Level.Debug, // to see ssh establishment logLevel in multiJvmCreateLogger := Level.Debug, // to see ssh establishment
assemblyMergeStrategy in assembly in MultiJvm := {
case n if n.endsWith("logback-test.xml") ⇒ MergeStrategy.first
case n => (assemblyMergeStrategy in assembly in MultiJvm).value.apply(n)
},
multiJvmCreateLogger in MultiJvm := { // to use normal sbt logging infra instead of custom sbt-multijvm-one multiJvmCreateLogger in MultiJvm := { // to use normal sbt logging infra instead of custom sbt-multijvm-one
val previous = (multiJvmCreateLogger in MultiJvm).value val previous = (multiJvmCreateLogger in MultiJvm).value
val logger = streams.value.log val logger = streams.value.log
@ -83,8 +88,7 @@ object MultiNode extends AutoPlugin {
def log(level: Level.Value, message: => String): Unit = def log(level: Level.Value, message: => String): Unit =
logger.log(level, s"[${scala.Console.BLUE}$name${scala.Console.RESET}] $message") logger.log(level, s"[${scala.Console.BLUE}$name${scala.Console.RESET}] $message")
} }
} }) ++
) ++
CliOptions.hostsFileName.map(multiNodeHostsFileName in MultiJvm := _) ++ CliOptions.hostsFileName.map(multiNodeHostsFileName in MultiJvm := _) ++
CliOptions.javaName.map(multiNodeJavaName in MultiJvm := _) ++ CliOptions.javaName.map(multiNodeJavaName in MultiJvm := _) ++
CliOptions.targetDirName.map(multiNodeTargetDirName in MultiJvm := _) ++ CliOptions.targetDirName.map(multiNodeTargetDirName in MultiJvm := _) ++
@ -109,10 +113,7 @@ object MultiNode extends AutoPlugin {
Def.settings((compile in MultiJvm) := { Def.settings((compile in MultiJvm) := {
(headerCreate in MultiJvm).value (headerCreate in MultiJvm).value
(compile in MultiJvm).value (compile in MultiJvm).value
}) ++ headerSettings(MultiJvm) ++ Seq( }) ++ headerSettings(MultiJvm) ++ Seq(validateCompile := compile.?.all(anyConfigsInThisProject).value)
validateCompile := compile.?.all(anyConfigsInThisProject).value
)
implicit class TestResultOps(val self: TestResult) extends AnyVal { implicit class TestResultOps(val self: TestResult) extends AnyVal {
def id: Int = self match { def id: Int = self match {
@ -130,14 +131,25 @@ object MultiNodeScalaTest extends AutoPlugin {
override def requires = MultiNode override def requires = MultiNode
override lazy val projectSettings = Seq( override lazy val projectSettings =
Seq(
extraOptions in MultiJvm := { extraOptions in MultiJvm := {
val src = (sourceDirectory in MultiJvm).value val src = (sourceDirectory in MultiJvm).value
(name: String) => (src ** (name + ".conf")).get.headOption.map("-Dakka.config=" + _.absolutePath).toSeq (name: String) => (src ** (name + ".conf")).get.headOption.map("-Dakka.config=" + _.absolutePath).toSeq
}, },
scalatestOptions in MultiJvm := { scalatestOptions in MultiJvm := {
Seq("-C", "org.scalatest.extra.QuietReporter") ++ Seq("-C", "org.scalatest.extra.QuietReporter") ++
(if (excludeTestTags.value.isEmpty) Seq.empty else Seq("-l", if (MultiNode.CliOptions.multiNode.get) excludeTestTags.value.mkString("\"", " ", "\"") else excludeTestTags.value.mkString(" "))) ++ (if (excludeTestTags.value.isEmpty) Seq.empty
(if (onlyTestTags.value.isEmpty) Seq.empty else Seq("-n", if (MultiNode.CliOptions.multiNode.get) onlyTestTags.value.mkString("\"", " ", "\"") else onlyTestTags.value.mkString(" "))) else
Seq(
"-l",
if (MultiNode.CliOptions.multiNode.get) excludeTestTags.value.mkString("\"", " ", "\"")
else excludeTestTags.value.mkString(" "))) ++
(if (onlyTestTags.value.isEmpty) Seq.empty
else
Seq(
"-n",
if (MultiNode.CliOptions.multiNode.get) onlyTestTags.value.mkString("\"", " ", "\"")
else onlyTestTags.value.mkString(" ")))
}) })
} }