Pass javaOpts into SuiteRunner and allow setting them from SBTRunner

Previously there was no way to set the Java options from sbt. While the
Scala build script sets `javaOptions` this only affects the JVM which
runs the partest launcher, not the actual tests. This commit improves
the handling of `javaOpts` in partest and allows setting it from
SBTRunner. You can pass a special ‘-Dpartest.java_opts=…’ argument to
it which is handled directly in SBTRunner. partest usage from ant and
from the command line does not change.

Author: szeiger

src/main/scala/scala/tools/partest/nest/AntRunner.scala

@@ -19,9 +19,8 @@ abstract class AntRunner(srcDir: String, testClassLoader: URLClassLoader, javaCm
   failed  = false,
   javaCmdPath = Option(javaCmd).map(_.getAbsolutePath) getOrElse PartestDefaults.javaCmd,
   javacCmdPath = Option(javacCmd).map(_.getAbsolutePath) getOrElse PartestDefaults.javacCmd,
-  scalacExtraArgs = scalacArgs) {
-
-  for (jOpts <- javaOpts) System.setProperty("partest.java_opts", jOpts mkString " ")
+  scalacExtraArgs = scalacArgs,
+  javaOpts = javaOpts.map(_.mkString(" ")).getOrElse(PartestDefaults.javaOpts)) {
 
   def error(msg: String): Nothing = sys.error(msg)
   def echo(msg: String): Unit

src/main/scala/scala/tools/partest/nest/Runner.scala

@@ -146,7 +146,7 @@ class Runner(val testFile: File, val suiteRunner: SuiteRunner) {
 
     val testFullPath = testFile.getAbsolutePath
 
-    // Note! As this currently functions, PartestDefaults.javaOpts must precede argString
+    // Note! As this currently functions, suiteRunner.javaOpts must precede argString
     // because when an option is repeated to java only the last one wins.
     // That means until now all the .javaopts files were being ignored because
     // they all attempt to change options which are also defined in
@@ -174,7 +174,7 @@ class Runner(val testFile: File, val suiteRunner: SuiteRunner) {
     val classpath = joinPaths(extraClasspath ++ testClassPath)
 
     javaCmdPath +: (
-      (PartestDefaults.javaOpts.split(' ') ++ extraJavaOptions ++ argString.split(' ')).map(_.trim).filter(_ != "").toList ++ Seq(
+      (suiteRunner.javaOpts.split(' ') ++ extraJavaOptions ++ argString.split(' ')).map(_.trim).filter(_ != "").toList ++ Seq(
         "-classpath",
         join(outDir.toString, classpath)
       ) ++ propertyOptions ++ Seq(
@@ -516,7 +516,7 @@ class Runner(val testFile: File, val suiteRunner: SuiteRunner) {
       if (NestUI._verbose) List("-verbose", "-noinput")
       else List("-noinput")
     val cmd = javaCmdPath +: (
-      PartestDefaults.javaOpts.split(' ').map(_.trim).filter(_ != "") ++ Seq(
+      suiteRunner.javaOpts.split(' ').map(_.trim).filter(_ != "") ++ Seq(
         "-classpath",
         antLauncher.path,
         "org.apache.tools.ant.launch.Launcher"
@@ -753,7 +753,8 @@ class SuiteRunner(
   val failed: Boolean,
   val javaCmdPath: String = PartestDefaults.javaCmd,
   val javacCmdPath: String = PartestDefaults.javacCmd,
-  val scalacExtraArgs: Seq[String] = Seq.empty) {
+  val scalacExtraArgs: Seq[String] = Seq.empty,
+  val javaOpts: String = PartestDefaults.javaOpts) {
 
   import PartestDefaults.{ numThreads, waitTime }
 
@@ -775,7 +776,7 @@ class SuiteRunner(
       |Compilation Path:    ${relativize(joinPaths(fileManager.testClassPath))}
       |Java binaries in:    $vmBin
       |Java runtime is:     $vmName
-      |Java options are:    ${PartestDefaults.javaOpts}
+      |Java options are:    $javaOpts
       |baseDir:             $baseDir
       |sourceDir:           ${PathSettings.srcDir}
     """.stripMargin

src/main/scala/scala/tools/partest/nest/SBTRunner.scala

@@ -24,19 +24,26 @@ import TestState._
 // called reflectively from scala-partest-test-interface
 class SBTRunner(partestFingerprint: Fingerprint, eventHandler: EventHandler, loggers: Array[Logger],
     srcDir: String, testClassLoader: URLClassLoader, javaCmd: File, javacCmd: File, scalacArgs: Array[String], args: Array[String])
-    extends AbstractRunner(args.mkString(" ")) {
+    extends AbstractRunner(args.filter(a => !a.startsWith("-D")).mkString(" ")) {
 
   // no summary, SBT will do that for us
   summarizing = true
 
+  val javaOpts = {
+    val l = args.filter(_.startsWith("-Dpartest.java_opts=")).map(_.substring(20))
+    if(l.isEmpty) PartestDefaults.javaOpts
+    else l.mkString(" ")
+  }
+
   override val suiteRunner = new SuiteRunner(
     testSourcePath = Option(srcDir) getOrElse PartestDefaults.sourcePath,
     new FileManager(testClassLoader = testClassLoader),
     updateCheck = optUpdateCheck,
     failed  = optFailed,
     javaCmdPath = Option(javaCmd).map(_.getAbsolutePath) getOrElse PartestDefaults.javaCmd,
     javacCmdPath = Option(javacCmd).map(_.getAbsolutePath) getOrElse PartestDefaults.javacCmd,
-    scalacExtraArgs = scalacArgs) {
+    scalacExtraArgs = scalacArgs,
+    javaOpts = javaOpts) {
 
       override def onFinishTest(testFile: File, result: TestState): TestState = {
         eventHandler.handle(new Event {