Skip to content

Commit

Permalink
Lower 32-bit Windows memory limit
Browse files Browse the repository at this point in the history
[finishes #70862196]
  • Loading branch information
adamhooper committed May 19, 2014
1 parent b505eee commit 411a6ce
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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)
}
}
Expand Down

0 comments on commit 411a6ce

Please sign in to comment.