spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pwend...@apache.org
Subject [1/2] git commit: Made java options to be applied during tests so that they become self explanatory.
Date Mon, 06 Jan 2014 19:42:47 GMT
Updated Branches:
  refs/heads/master 60edeb3d6 -> 93bf96205


Made java options to be applied during tests so that they become self explanatory.


Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/2d0825e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/2d0825e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/2d0825e9

Branch: refs/heads/master
Commit: 2d0825e9f4f4059e0008c5753840b73893667701
Parents: a2e7e04
Author: Prashant Sharma <prashant.s@imaginea.com>
Authored: Mon Jan 6 16:03:31 2014 +0530
Committer: Prashant Sharma <prashant.s@imaginea.com>
Committed: Mon Jan 6 16:03:31 2014 +0530

----------------------------------------------------------------------
 project/SparkBuild.scala | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/2d0825e9/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index a6c560d..eda9252 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"),


Mime
View raw message