From 411a6ce104c24660a80fb3c069b4d6cea91892df Mon Sep 17 00:00:00 2001 From: Adam Hooper Date: Mon, 19 May 2014 15:25:36 -0400 Subject: [PATCH] Lower 32-bit Windows memory limit [finishes #70862196] --- .../org/overviewproject/runner/commands/JvmCommand.scala | 4 ++-- .../org/overviewproject/runner/commands/JvmCommandSpec.scala | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runner/src/main/scala/org/overviewproject/runner/commands/JvmCommand.scala b/runner/src/main/scala/org/overviewproject/runner/commands/JvmCommand.scala index 80e970062..30906ada2 100644 --- a/runner/src/main/scala/org/overviewproject/runner/commands/JvmCommand.scala +++ b/runner/src/main/scala/org/overviewproject/runner/commands/JvmCommand.scala @@ -92,6 +92,6 @@ object JvmCommand { retval == 0 } - private val Max32BitHeapSize : Long = 1468006400 - private val Max32BitHeapSizeString : String = "1400m" + private val Max32BitHeapSize : Long = 1363148800 + private val Max32BitHeapSizeString : String = "1300m" } diff --git a/runner/src/test/scala/org/overviewproject/runner/commands/JvmCommandSpec.scala b/runner/src/test/scala/org/overviewproject/runner/commands/JvmCommandSpec.scala index 8cf3184c8..c6fac51c5 100644 --- a/runner/src/test/scala/org/overviewproject/runner/commands/JvmCommandSpec.scala +++ b/runner/src/test/scala/org/overviewproject/runner/commands/JvmCommandSpec.scala @@ -37,7 +37,7 @@ class JvmCommandSpec extends Specification { "decrease heap sizes in with32BitSafe(false)" in { val cmd = new JvmCommand(Seq(), Seq("-Xms3g", "-Xmx4000m", "-Xmn2000000k", "-Xint"), Seq()) - cmd.with32BitSafe(false).jvmArgs.take(4) must beEqualTo(Seq("-Xms1400m", "-Xmx1400m", "-Xmn1400m", "-Xint")) + cmd.with32BitSafe(false).jvmArgs.take(4) must beEqualTo(Seq("-Xms1300m", "-Xmx1300m", "-Xmn1300m", "-Xint")) } "add -Doverview.is32BitJava=true in with32BitSafe(false)" in { @@ -56,7 +56,7 @@ class JvmCommandSpec extends Specification { } "not decrease heap sizes when they are small enough already" in { - val cmd = new JvmCommand(Seq(), Seq("-Xms1024m", "-Xmx1350m", "-Xmn200k", "-Xint"), Seq()) + val cmd = new JvmCommand(Seq(), Seq("-Xms1024m", "-Xmx1250m", "-Xmn200k", "-Xint"), Seq()) cmd.with32BitSafe(false).jvmArgs.take(4) must beEqualTo(cmd.jvmArgs) } }