Use the same memory options everywhere

Previously, A max heap of 1G was used for Jenkins which is not enough
for Dotty anymore. This commit standardizes on what sbt uses which
should be less confusing.

Author: smarter

project/Build.scala

@@ -6,10 +6,11 @@ import scala.reflect.io.Path
 
 object DottyBuild extends Build {
 
-  val travisMemLimit = List("-Xmx1g", "-Xss2m")
-
   val JENKINS_BUILD = "dotty.jenkins.build"
 
+  // This is what sbt uses (http://www.scala-sbt.org/0.13/docs/Manual-Installation.html)
+  val memoryOptions = List("-Xms512M", "-Xmx1536M", "-Xss1M")
+
   val agentOptions = List(
     // "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005"
     // "-agentpath:/home/dark/opt/yjp-2013-build-13072/bin/linux-x86-64/libyjpagent.so"
@@ -113,7 +114,7 @@ object DottyBuild extends Build {
 
       val travis_build = // propagate if this is a travis build
         if (sys.props.isDefinedAt(JENKINS_BUILD))
-          List(s"-D$JENKINS_BUILD=${sys.props(JENKINS_BUILD)}") ::: travisMemLimit
+          List(s"-D$JENKINS_BUILD=${sys.props(JENKINS_BUILD)}")
         else
           List()
 
@@ -124,7 +125,7 @@ object DottyBuild extends Build {
         else
           List()
 
-      ("-DpartestParentID=" + pid) :: tuning ::: agentOptions ::: travis_build ::: fullpath
+      ("-DpartestParentID=" + pid) :: tuning ::: memoryOptions ::: agentOptions ::: travis_build ::: fullpath
     }
   ) ++ addCommandAlias("partest", ";test:package;package;test:runMain dotc.build;lockPartestFile;test:test;runPartestRunner") ++
        addCommandAlias("partest-only",             ";test:package;package;test:runMain dotc.build;lockPartestFile;test:test-only dotc.tests;runPartestRunner") ++
@@ -169,7 +170,7 @@ object DottyBuild extends Build {
           List(s"-D$JENKINS_BUILD=${sys.props(JENKINS_BUILD)}")
         else
           List()
-      val res = agentOptions ::: travis_build ::: fullpath
+      val res = memoryOptions ::: agentOptions ::: travis_build ::: fullpath
       println("Running with javaOptions: " + res)
       res
     }