diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-04-11 22:29:37 -0400 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-04-11 22:29:37 -0400 |
| commit | ed336e0d44d27e9be66adb0962f82af7d1ac4d87 (patch) | |
| tree | 126657687ed7c65f03f8073dd468a74720f20819 /project/SparkBuild.scala | |
| parent | 7cd83bf0f8546e7ed5b999b6c8b3ac2667211c47 (diff) | |
| download | spark-ed336e0d44d27e9be66adb0962f82af7d1ac4d87.tar.gz spark-ed336e0d44d27e9be66adb0962f82af7d1ac4d87.tar.bz2 spark-ed336e0d44d27e9be66adb0962f82af7d1ac4d87.zip | |
Fix tests from different projects running in parallel in SBT 0.12
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index f03efd6c83..0e55c51204 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -44,7 +44,10 @@ object SparkBuild extends Build { transitiveClassifiers in Scope.GlobalScope := Seq("sources"), 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/"), // For Sonatype publishing @@ -98,7 +101,6 @@ object SparkBuild extends Build { "com.novocode" % "junit-interface" % "0.9" % "test", "org.easymock" % "easymock" % "3.1" % "test" ), - parallelExecution := false, /* Workaround for issue #206 (fixed after SBT 0.11.0) */ watchTransitiveSources <<= Defaults.inDependencies[Task[Seq[File]]](watchSources.task, const(std.TaskExtra.constant(Nil)), aggregate = true, includeRoot = true) apply { _.join.map(_.flatten) }, |