summaryrefslogtreecommitdiff
path: root/test/partest
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-01-26 11:30:20 -0800
committerPaul Phillips <paulp@improving.org>2013-01-26 11:32:26 -0800
commit7c45aa5edbab4a060eb6a7118187d9037b4fb046 (patch)
tree3d57e14e304853921e5bcdea8633052ea7a6234e /test/partest
parent2fa859e1b3eb2ac57058feaba87d96adfbac9209 (diff)
downloadscala-7c45aa5edbab4a060eb6a7118187d9037b4fb046.tar.gz
scala-7c45aa5edbab4a060eb6a7118187d9037b4fb046.tar.bz2
scala-7c45aa5edbab4a060eb6a7118187d9037b4fb046.zip
Bumped partest MaxPermSize to 128m.
Diffstat (limited to 'test/partest')
-rwxr-xr-xtest/partest7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/partest b/test/partest
index 186c0d1580..dd57137b21 100755
--- a/test/partest
+++ b/test/partest
@@ -74,9 +74,10 @@ if $cygwin; then
EXT_CLASSPATH=`cygpath --path --$format "$EXT_CLASSPATH"`
fi
-# last arg wins, so if JAVA_OPTS already contains -Xmx or -Xms the
-# supplied argument will be used.
-JAVA_OPTS="-Xmx1024M -Xms64M $JAVA_OPTS"
+# last arg wins, so if JAVA_OPTS already contains one of these options
+# 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"
partestDebugStr=""
if [ ! -z "${PARTEST_DEBUG}" ] ; then