Repository: spark Updated Branches: refs/heads/branch-1.0 e480bcfbd -> 379f733e9
Fix: sbt test throw an java.lang.OutOfMemoryError: PermGen space Author: witgo <wi...@qq.com> Closes #773 from witgo/sbt_javaOptions and squashes the following commits: 26c7d38 [witgo] Improve sbt configuration (cherry picked from commit fde82c1549c78f1eebbb21ec34e60befbbff65f5) Signed-off-by: Reynold Xin <r...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/379f733e Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/379f733e Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/379f733e Branch: refs/heads/branch-1.0 Commit: 379f733e988daf2f1cae4cdac2faf1c42998b2b5 Parents: e480bcf Author: witgo <wi...@qq.com> Authored: Wed May 14 11:19:26 2014 -0700 Committer: Reynold Xin <r...@apache.org> Committed: Wed May 14 11:19:43 2014 -0700 ---------------------------------------------------------------------- .rat-excludes | 5 +++++ project/SparkBuild.scala | 1 + 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/379f733e/.rat-excludes ---------------------------------------------------------------------- diff --git a/.rat-excludes b/.rat-excludes index 5076695..6894678 100644 --- a/.rat-excludes +++ b/.rat-excludes @@ -43,3 +43,8 @@ test.out/* .*iml service.properties db.lck +build/* +dist/* +.*out +.*ipr +.*iws http://git-wip-us.apache.org/repos/asf/spark/blob/379f733e/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 2d10d89..9cec1be 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -183,6 +183,7 @@ object SparkBuild extends Build { javaOptions in Test += "-Dspark.testing=1", javaOptions in Test += "-Dsun.io.serialization.extendedDebugInfo=true", javaOptions in Test ++= System.getProperties.filter(_._1 startsWith "spark").map { case (k,v) => s"-D$k=$v" }.toSeq, + javaOptions in Test ++= "-Xmx3g -XX:PermSize=128M -XX:MaxNewSize=256m -XX:MaxPermSize=1g".split(" ").toSeq, javaOptions += "-Xmx3g", // Show full stack trace and duration in test cases. testOptions in Test += Tests.Argument("-oDF"),
