From 6ade676bf9e1796a74fc4b4eb289b985c07e6100 Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Tue, 1 Mar 2016 14:30:45 +0100
Subject: [PATCH 1/2] Rename travisMemLimit to jenkinsMemLimit, we don't use
 travis anymore

---
 project/Build.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/Build.scala b/project/Build.scala
index 8b7238a09eee..f9c934daba1d 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -8,7 +8,7 @@ object DottyBuild extends Build {
 
   // Currently, this cannot be increased without hitting the maximum amount of memory
   // available on the Jenkins VMs
-  val travisMemLimit = List("-Xmx1100m")
+  val jenkinsMemLimit = List("-Xmx1100m")
 
   val JENKINS_BUILD = "dotty.jenkins.build"
 
@@ -126,7 +126,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)}") ::: jenkinsMemLimit
           else
             List()
 

From acf05353a599de11e466b5e35cd003a2f6aa5312 Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Tue, 1 Mar 2016 14:30:58 +0100
Subject: [PATCH 2/2] Build.scala: increase Jenkins max heap from 1.1G to 1.3G

This should be safe now that run tests do not take so much memory
anymore (cf #1033 and  #1076).

It would be even better if we could figure out why we're using so much
memory, but that's less important than avoiding spurious test failures.
---
 project/Build.scala | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/project/Build.scala b/project/Build.scala
index f9c934daba1d..66a380e96667 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -6,9 +6,7 @@ import scala.reflect.io.Path
 
 object DottyBuild extends Build {
 
-  // Currently, this cannot be increased without hitting the maximum amount of memory
-  // available on the Jenkins VMs
-  val jenkinsMemLimit = List("-Xmx1100m")
+  val jenkinsMemLimit = List("-Xmx1300m")
 
   val JENKINS_BUILD = "dotty.jenkins.build"