summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2015-07-15 21:49:49 -0400
committerSeth Tisue <seth@tisue.net>2015-07-15 21:49:49 -0400
commitfba4a10f26ebd5d1f0457c38ff292a366832cd4b (patch)
tree575bd410c8eeb05515f531d0fcadfc035e4c4b05 /test
parenteda41a253ee004318262ce1a12c4f44a45aec229 (diff)
parent05cf32c55f6c8b74920a8a059831e9593e3ab233 (diff)
downloadscala-fba4a10f26ebd5d1f0457c38ff292a366832cd4b.tar.gz
scala-fba4a10f26ebd5d1f0457c38ff292a366832cd4b.tar.bz2
scala-fba4a10f26ebd5d1f0457c38ff292a366832cd4b.zip
Merge pull request #4626 from SethTisue/java-8-no-more-permgen
remove -XX:MaxPermSize=128M; it doesn't exist in Java 8
Diffstat (limited to 'test')
-rwxr-xr-xtest/partest3
1 files changed, 1 insertions, 2 deletions
diff --git a/test/partest b/test/partest
index f396459c6d..7e19c92165 100755
--- a/test/partest
+++ b/test/partest
@@ -117,8 +117,7 @@ fi
# last arg wins, so if JAVA_OPTS already contains -Xmx or -Xms the
# supplied argument will be used.
-# At this writing it is reported test/partest --all requires 108m permgen.
-JAVA_OPTS="-Xmx1024M -Xms64M -XX:MaxPermSize=128M $JAVA_OPTS"
+JAVA_OPTS="-Xmx1024M -Xms64M $JAVA_OPTS"
# the ant task doesn't supply any options by default,
# so don't do that here either -- note that you may want to pass -optimise