summaryrefslogtreecommitdiff
path: root/build.sbt
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2016-10-18 21:26:42 +1100
committerJason Zaugg <jzaugg@gmail.com>2016-10-18 21:28:45 +1100
commitc6a64ab31364f9e91f9aab37a1e568a52fb3e076 (patch)
treec5cd18a931495e46204c658aaae29f5e5c2f7d07 /build.sbt
parent933bab29ecd8a9ec23e14cc37db9c4cdd666e34f (diff)
downloadscala-c6a64ab31364f9e91f9aab37a1e568a52fb3e076.tar.gz
scala-c6a64ab31364f9e91f9aab37a1e568a52fb3e076.tar.bz2
scala-c6a64ab31364f9e91f9aab37a1e568a52fb3e076.zip
Avoid use of legacy JVM MaxPermSize option in partest
In Java 8+, which we require on this branch, this option is a no-op and triggers a JVM warning these days. See http://openjdk.java.net/jeps/122
Diffstat (limited to 'build.sbt')
-rw-r--r--build.sbt2
1 files changed, 1 insertions, 1 deletions
diff --git a/build.sbt b/build.sbt
index 1ea2ba6386..95dc156f16 100644
--- a/build.sbt
+++ b/build.sbt
@@ -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