diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2014-01-06 16:03:31 +0530 |
|---|---|---|
| committer | Prashant Sharma <prashant.s@imaginea.com> | 2014-01-06 16:03:31 +0530 |
| commit | 2d0825e9f4f4059e0008c5753840b73893667701 (patch) | |
| tree | 65a83377d76ce621d86bb755c502373df781ee7e /project | |
| parent | a2e7e0497484554f86bd71e93705eb0422b1512b (diff) | |
| download | spark-2d0825e9f4f4059e0008c5753840b73893667701.tar.gz spark-2d0825e9f4f4059e0008c5753840b73893667701.tar.bz2 spark-2d0825e9f4f4059e0008c5753840b73893667701.zip | |
Made java options to be applied during tests so that they become self explanatory.
Diffstat (limited to 'project')
| -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 a6c560d5c6..eda925227e 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"), |