Merge remote-tracking branch 'origin/2.10.x' into pr/merge-210

* commit 'd392d56d6bf8b0ae9072b354e4ec68becd0df679':
  SI-4602 Disable unreliable test of fsc path absolutization
  Update a checkfile from a recent fix.
  SI-7018 Fix memory leak in Attachments.
  SI-4733 - fsc no longer creates a single temp directory for all users.
  Bumped partest MaxPermSize to 128m.
  SI-6891 Fix value class + tailrec crasher.
  Ill-scoped reference checking in TreeCheckers
  Make value classes TreeCheckers friendly
  SI-4602 Make fsc absolutize source file names
  SI-6863 Fix verify error in captured var inited from expr with try/catch
  SI-6932 Remove Batchable trait plus minor clean-ups
  Fix SI-6932 by enabling linearization of callback execution for the internal execution context of Future
  SI-6443 Expand test coverage with varargs, by-name.
  SI-6443 Widen dependent param types in uncurry

Conflicts:
	src/reflect/scala/reflect/internal/Trees.scala
	test/partest

1 files changed, 3 insertions, 1 deletions

diff --git a/test/partest b/test/partest
index 2bd8ce94f3..9b0ab02fdc 100755
--- a/test/partest
+++ b/test/partest
@@ -82,7 +82,9 @@ 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"
+# At this writing it is reported test/partest --all requires 108m permgen.
+JAVA_OPTS="-Xmx1024M -Xms64M -XX:MaxPermSize=128M $JAVA_OPTS"
+
 # the ant task doesn't supply any options by default,
 # so don't to that here either -- note that you may want to pass -optimise
 # to mimic what happens during nightlies