Inline FileManager.JAVA_OPTS as it's used only once

Author: adriaanm

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

@@ -160,16 +160,14 @@ class FileManager(val testClassPath: List[Path],
     this(testClassPath, trifecta._1, trifecta._2, trifecta._3)
   }
 
-  lazy val testClassLoader =
-    ScalaClassLoader fromURLs (testClassPath map (_.toURI.toURL))
+  lazy val testClassLoader = ScalaClassLoader fromURLs (testClassPath map (_.toURI.toURL))
 
   // basedir for jars or classfiles on core classpath
   lazy val baseDir = libraryUnderTest.parent
 
   lazy val JAVACMD: String          = javaCmd getOrElse PartestDefaults.javaCmd
   lazy val JAVAC_CMD: String        = javacCmd getOrElse PartestDefaults.javacCmd
   lazy val SCALAC_OPTS: Seq[String] = scalacOpts ++ PartestDefaults.scalacOpts.split(' ').toSeq
-  lazy val JAVA_OPTS: String        = PartestDefaults.javaOpts
 
   def distKind = {
     val p = libraryUnderTest.getAbsolutePath

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

@@ -154,7 +154,7 @@ class Runner(val testFile: File, fileManager: FileManager, updateCheck: Boolean)
 
     val testFullPath = testFile.getAbsolutePath
 
-    // Note! As this currently functions, JAVA_OPTS must precede argString
+    // Note! As this currently functions, PartestDefaults.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
@@ -181,7 +181,7 @@ class Runner(val testFile: File, fileManager: FileManager, updateCheck: Boolean)
     val classpath = joinPaths(extraClasspath ++ testClassPath)
 
     javaCmd +: (
-      (JAVA_OPTS.split(' ') ++ extraJavaOptions ++ argString.split(' ')).map(_.trim).filter(_ != "").toList ++ Seq(
+      (PartestDefaults.javaOpts.split(' ') ++ extraJavaOptions ++ argString.split(' ')).map(_.trim).filter(_ != "").toList ++ Seq(
         "-classpath",
         join(outDir.toString, classpath)
       ) ++ propertyOptions ++ Seq(
@@ -534,7 +534,7 @@ class Runner(val testFile: File, fileManager: FileManager, updateCheck: Boolean)
       if (NestUI._verbose) List("-verbose", "-noinput")
       else List("-noinput")
     val cmd = javaCmd +: (
-      JAVA_OPTS.split(' ').map(_.trim).filter(_ != "") ++ Seq(
+      PartestDefaults.javaOpts.split(' ').map(_.trim).filter(_ != "") ++ Seq(
         "-classpath",
         antLauncherPath,
         "org.apache.tools.ant.launch.Launcher"
@@ -743,15 +743,14 @@ abstract class DirectRunner {
     def relativize(path: String) = path.replace(fileManager.baseDir.toString, "$baseDir").replace(PathSettings.srcDir.toString, "$sourceDir")
     val vmBin  = javaHome + fileSeparator + "bin"
     val vmName = "%s (build %s, %s)".format(javaVmName, javaVmVersion, javaVmInfo)
-    val vmOpts = fileManager.JAVA_OPTS
 
   s"""|Compiler under test: ${relativize(fileManager.compilerUnderTest.getAbsolutePath)}
       |Scala version is:    $versionMsg
       |Scalac options are:  ${fileManager.SCALAC_OPTS mkString " "}
       |Compilation Path:    ${relativize(joinPaths(fileManager.testClassPath))}
       |Java binaries in:    $vmBin
       |Java runtime is:     $vmName
-      |Java options are:    $vmOpts
+      |Java options are:    ${PartestDefaults.javaOpts}
       |baseDir:             ${fileManager.baseDir}
       |sourceDir:           ${PathSettings.srcDir}
     """.stripMargin