ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix tests from different projects running in parallel in SBT 0.12

Browse source
This commit is contained in:
Matei Zaharia 2013-04-11 22:29:37 -04:00
parent 7cd83bf0f8
commit ed336e0d44
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
project/SparkBuild.scala
View file

@ -44,7 +44,10 @@ object SparkBuild extends Build {
transitiveClassifiers in Scope.GlobalScope := Seq("sources"), transitiveClassifiers in Scope.GlobalScope := Seq("sources"),
testListeners <<= target.map(t => Seq(new eu.henkelmann.sbt.JUnitXmlTestsListener(t.getAbsolutePath))), testListeners <<= target.map(t => Seq(new eu.henkelmann.sbt.JUnitXmlTestsListener(t.getAbsolutePath))),
// shared between both core and streaming. // Only allow one test at a time, even across projects, since they run in the same JVM
concurrentRestrictions in Global += Tags.limit(Tags.Test, 1),
// Shared between both core and streaming.
resolvers ++= Seq("Akka Repository" at "http://repo.akka.io/releases/"), resolvers ++= Seq("Akka Repository" at "http://repo.akka.io/releases/"),
// For Sonatype publishing // For Sonatype publishing
@ -98,7 +101,6 @@ object SparkBuild extends Build {
"com.novocode" % "junit-interface" % "0.9" % "test", "com.novocode" % "junit-interface" % "0.9" % "test",
"org.easymock" % "easymock" % "3.1" % "test" "org.easymock" % "easymock" % "3.1" % "test"
), ),
parallelExecution := false,
/* Workaround for issue #206 (fixed after SBT 0.11.0) */ /* Workaround for issue #206 (fixed after SBT 0.11.0) */
watchTransitiveSources <<= Defaults.inDependencies[Task[Seq[File]]](watchSources.task, watchTransitiveSources <<= Defaults.inDependencies[Task[Seq[File]]](watchSources.task,
const(std.TaskExtra.constant(Nil)), aggregate = true, includeRoot = true) apply { _.join.map(_.flatten) }, const(std.TaskExtra.constant(Nil)), aggregate = true, includeRoot = true) apply { _.join.map(_.flatten) },

2
project/build.properties
View file

@ -1 +1 @@
sbt.version=0.12.2 sbt.version=0.12.3