diff options
| author | Seth Tisue <seth@tisue.net> | 2016-10-18 08:09:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-18 08:09:24 -0700 |
| commit | 114dad8848ad97cd343f10acdac7bccd888a1576 (patch) | |
| tree | c5cd18a931495e46204c658aaae29f5e5c2f7d07 /build.sbt | |
| parent | 933bab29ecd8a9ec23e14cc37db9c4cdd666e34f (diff) | |
| parent | c6a64ab31364f9e91f9aab37a1e568a52fb3e076 (diff) | |
| download | scala-114dad8848ad97cd343f10acdac7bccd888a1576.tar.gz scala-114dad8848ad97cd343f10acdac7bccd888a1576.tar.bz2 scala-114dad8848ad97cd343f10acdac7bccd888a1576.zip | |
Merge pull request #5462 from retronym/topic/perm-size-be-gone
Avoid use of legacy JVM MaxPermSize option in partest
Diffstat (limited to 'build.sbt')
| -rw-r--r-- | build.sbt | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -632,7 +632,7 @@ lazy val test = project javaOptions in IntegrationTest += "-Xmx2G", testFrameworks += new TestFramework("scala.tools.partest.sbt.Framework"), testFrameworks -= new TestFramework("org.scalacheck.ScalaCheckFramework"), - testOptions in IntegrationTest += Tests.Argument("-Dpartest.java_opts=-Xmx1024M -Xms64M -XX:MaxPermSize=128M"), + testOptions in IntegrationTest += Tests.Argument("-Dpartest.java_opts=-Xmx1024M -Xms64M"), testOptions in IntegrationTest += Tests.Argument("-Dpartest.scalac_opts=" + (scalacOptions in Compile).value.mkString(" ")), testOptions in IntegrationTest += Tests.Setup { () => val cp = (dependencyClasspath in Test).value |