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

Deprecated build symbols replaced

Browse source
This commit is contained in:
Johan Andrén 2017-03-15 14:36:25 +01:00
parent 39199b877a
commit fca07bb976
8 changed files with 80 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

32
project/MultiNode.scala
View file

@ -58,9 +58,9 @@ object MultiNode extends AutoPlugin {
inConfig(MultiJvm)(SbtScalariform.configScalariformSettings) ++
Seq(
jvmOptions in MultiJvm := defaultMultiJvmOptions,
compileInputs in(MultiJvm, compile) <<= (compileInputs in(MultiJvm, compile)) dependsOn (ScalariformKeys.format in MultiJvm),
scalacOptions in MultiJvm <<= scalacOptions in Test,
compile in MultiJvm <<= (compile in MultiJvm) triggeredBy (compile in Test)
compileInputs in(MultiJvm, compile) := ((compileInputs in(MultiJvm, compile)) dependsOn (ScalariformKeys.format in MultiJvm)).value,
scalacOptions in MultiJvm := (scalacOptions in Test).value,
compile in MultiJvm := ((compile in MultiJvm) triggeredBy (compile in Test)).value
) ++
CliOptions.hostsFileName.map(multiNodeHostsFileName in MultiJvm := _) ++
CliOptions.javaName.map(multiNodeJavaName in MultiJvm := _) ++
@ -68,17 +68,18 @@ object MultiNode extends AutoPlugin {
(if (multiNodeTestInTest) {
// make sure that MultiJvm tests are executed by the default test target,
// and combine the results from ordinary test and multi-jvm tests
(executeTests in Test <<= (executeTests in Test, multiExecuteTests) map {
case (testResults, multiNodeResults) =>
val overall =
if (testResults.overall.id < multiNodeResults.overall.id)
multiNodeResults.overall
else
testResults.overall
Tests.Output(overall,
testResults.events ++ multiNodeResults.events,
testResults.summaries ++ multiNodeResults.summaries)
})
(executeTests in Test) := {
val testResults = (executeTests in Test).value
val multiNodeResults = multiExecuteTests.value
val overall =
if (testResults.overall.id < multiNodeResults.overall.id)
multiNodeResults.overall
else
testResults.overall
Tests.Output(overall,
testResults.events ++ multiNodeResults.events,
testResults.summaries ++ multiNodeResults.summaries)
}
} else Nil)
}
@ -90,7 +91,8 @@ object MultiNodeScalaTest extends AutoPlugin {
override def requires = MultiNode
override lazy val projectSettings = Seq(
extraOptions in MultiJvm <<= (sourceDirectory in MultiJvm) { src =>
extraOptions in MultiJvm := {
val src = (sourceDirectory in MultiJvm).value
(name: String) => (src ** (name + ".conf")).get.headOption.map("-Dakka.config=" + _.absolutePath).toSeq
},
scalatestOptions in MultiJvm := {