diff options
| author | Michael Armbrust <michael@databricks.com> | 2014-03-02 00:35:23 -0800 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2014-03-02 00:35:23 -0800 |
| commit | 012bd5fbc97dc40bb61e0e2b9cc97ed0083f37f6 (patch) | |
| tree | 633b8fcb90c1481ca35e3742deae0b585617b206 /project | |
| parent | 6fc76e49c19310ec0d6cdf4754271ad09d652576 (diff) | |
| download | spark-012bd5fbc97dc40bb61e0e2b9cc97ed0083f37f6.tar.gz spark-012bd5fbc97dc40bb61e0e2b9cc97ed0083f37f6.tar.bz2 spark-012bd5fbc97dc40bb61e0e2b9cc97ed0083f37f6.zip | |
Merge the old sbt-launch-lib.bash with the new sbt-launcher jar downloading logic.
This allows developers to pass options (such as -D) to sbt. I also modified the SparkBuild to ensure spark specific properties are propagated to forked test JVMs.
Author: Michael Armbrust <michael@databricks.com>
Closes #14 from marmbrus/sbtScripts and squashes the following commits:
c008b18 [Michael Armbrust] Merge the old sbt-launch-lib.bash with the new sbt-launcher jar downloading logic.
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index c402415742..86340ada95 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -23,6 +23,8 @@ import AssemblyKeys._ import scala.util.Properties import org.scalastyle.sbt.ScalastylePlugin.{Settings => ScalaStyleSettings} +import scala.collection.JavaConversions._ + // For Sonatype publishing //import com.jsuereth.pgp.sbtplugin.PgpKeys._ @@ -140,6 +142,7 @@ object SparkBuild extends Build { fork := true, javaOptions in Test += "-Dspark.home=" + sparkHome, javaOptions in Test += "-Dspark.testing=1", + javaOptions in Test ++= System.getProperties.filter(_._1 startsWith "spark").map { case (k,v) => s"-D$k=$v" }.toSeq, javaOptions += "-Xmx3g", // Show full stack trace and duration in test cases. testOptions in Test += Tests.Argument("-oDF"), |