Move multi-jvm tests to src/multi-jvm

This commit is contained in:
Peter Vlugter 2011-07-11 11:38:28 +12:00
parent 29106c0df0
commit c0d60a17c6
106 changed files with 4 additions and 4 deletions

View file

@ -1,6 +1,6 @@
import sbt._
import Keys._
import MultiJvmPlugin.{ MultiJvm, extraOptions, multiJvmMarker }
import MultiJvmPlugin.{ MultiJvm, extraOptions }
object AkkaBuild extends Build {
lazy val buildSettings = Seq(
@ -65,12 +65,12 @@ object AkkaBuild extends Build {
dependencies = Seq(stm, actorTests % "test->test"),
settings = defaultSettings ++ MultiJvmPlugin.settings ++ Seq(
libraryDependencies ++= Dependencies.cluster,
sourceDirectory in MultiJvm <<= (sourceDirectory in Test).identity,
extraOptions in MultiJvm <<= (sourceDirectory in MultiJvm) { src =>
(name: String) => (src ** (name + ".conf")).get.headOption.map("-Dakka.config=" + _.absolutePath).toSeq
},
testOptions in Test <+= (multiJvmMarker in MultiJvm) map { m => Tests.Filter(s => !s.contains(m)) },
test in Test <<= test in Test dependsOn (test in MultiJvm)
// TODO: use dependsOn once updated to sbt 0.10.1 -- currently doesn't fail on error
// test in Test <<= (test in Test) dependsOn (test in MultiJvm)
test in Test <<= (test in MultiJvm, (test in Test).task) flatMap { (mj, t) => t }
)
) configs (MultiJvm)