diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-01-06 11:42:41 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-01-06 11:42:41 -0800 |
| commit | 93bf96205da5d2629c5ac3c6b1d6ce0690688415 (patch) | |
| tree | aa0ca4c628623ec491a3fb862d0d3c86b91dd17c /project/SparkBuild.scala | |
| parent | 60edeb3d652e97a3ea96e41ce1d33fabc7bcac66 (diff) | |
| parent | 2d0825e9f4f4059e0008c5753840b73893667701 (diff) | |
| download | spark-93bf96205da5d2629c5ac3c6b1d6ce0690688415.tar.gz spark-93bf96205da5d2629c5ac3c6b1d6ce0690688415.tar.bz2 spark-93bf96205da5d2629c5ac3c6b1d6ce0690688415.zip | |
Merge pull request #340 from ScrapCodes/sbt-fixes
Made java options to be applied during tests so that they become self explanatory.
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 4d2aa45664..051e5105f3 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -70,9 +70,7 @@ object SparkBuild extends Build { lazy val MavenCompile = config("m2r") extend(Compile) lazy val publishLocalBoth = TaskKey[Unit]("publish-local", "publish local for m2 and ivy") val sparkHome = System.getProperty("user.dir") - System.setProperty("spark.home", sparkHome) - System.setProperty("spark.testing", "1") - + // Allows build configuration to be set through environment variables lazy val hadoopVersion = Properties.envOrElse("SPARK_HADOOP_VERSION", DEFAULT_HADOOP_VERSION) lazy val isNewHadoop = Properties.envOrNone("SPARK_IS_NEW_HADOOP") match { @@ -115,8 +113,8 @@ object SparkBuild extends Build { // Fork new JVMs for tests and set Java options for those fork := true, - javaOptions += "-Dspark.home=" + sparkHome, - javaOptions += "-Dspark.testing=1", + javaOptions in Test += "-Dspark.home=" + sparkHome, + javaOptions in Test += "-Dspark.testing=1", javaOptions += "-Xmx3g", // Show full stack trace and duration in test cases. testOptions in Test += Tests.Argument("-oDF"), |