Pass testSourcePath as SuiteRunner constructor arg

Author: adriaanm

src/main/scala/scala/tools/partest/PartestDefaults.scala

@@ -6,6 +6,7 @@ import scala.tools.nsc.Properties.{ propOrElse, propOrNone, propOrEmpty }
 import java.lang.Runtime.{ getRuntime => runtime }
 
 object PartestDefaults {
+  def sourcePath  = propOrElse("partest.srcdir", "files")
   def javaCmd     = propOrElse("partest.javacmd", "java")
   def javacCmd    = propOrElse("partest.javac_cmd", "javac")
   def javaOpts    = propOrElse("partest.java_opts", "")

src/main/scala/scala/tools/partest/PartestTask.scala

@@ -115,8 +115,6 @@ class PartestTask extends Task with CompilationPathProperty with ScalaTask {
       NestUI.setDebug()
     }
 
-    srcDir foreach (nest.PathSettings.testSourcePath = _)
-
     if (compilationPath.isEmpty) sys.error("Mandatory attribute 'compilationPath' is not set.")
 
     def scalacArgsFlat: Array[String] = scalacArgs.toArray flatMap (_ flatMap { a =>
@@ -125,7 +123,7 @@ class PartestTask extends Task with CompilationPathProperty with ScalaTask {
     })
 
     var failureCount = 0
-    val summary = new scala.tools.partest.nest.AntRunner(compilationPath.get.list, javacmd.getOrElse(null), javaccmd.getOrElse(null), scalacArgsFlat) {
+    val summary = new scala.tools.partest.nest.AntRunner(srcDir.getOrElse(null), compilationPath.get.list, javacmd.getOrElse(null), javaccmd.getOrElse(null), scalacArgsFlat) {
       def echo(msg: String): Unit = PartestTask.this.log(msg)
       def log(msg: String): Unit = PartestTask.this.log(msg)
 

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

@@ -20,7 +20,8 @@ import sbt.testing.SuiteSelector
 import sbt.testing.TestSelector
 
 // not using any Scala types to ease calling across different scala versions
-abstract class AntRunner(compilationPaths: Array[String], javaCmd: File, javacCmd: File, scalacArgs: Array[String]) extends SuiteRunner(
+abstract class AntRunner(srcDir: String, compilationPaths: Array[String], javaCmd: File, javacCmd: File, scalacArgs: Array[String]) extends SuiteRunner(
+  testSourcePath = Option(srcDir) getOrElse PartestDefaults.sourcePath,
   new FileManager(testClassPath = compilationPaths map { fs => Path(fs) } toList),
   updateCheck = false,
   failed  = false,
@@ -67,7 +68,9 @@ abstract class AntRunner(compilationPaths: Array[String], javaCmd: File, javacCm
   }
 }
 
-class SBTRunner(partestFingerprint: Fingerprint, eventHandler: EventHandler, loggers: Array[Logger], compilationPaths: Array[String], javaCmd: File, javacCmd: File, scalacArgs: Array[String]) extends AntRunner(compilationPaths, javaCmd, javacCmd, scalacArgs) {
+class SBTRunner(partestFingerprint: Fingerprint, eventHandler: EventHandler, loggers: Array[Logger],
+    srcDir: String, compilationPaths: Array[String], javaCmd: File, javacCmd: File, scalacArgs: Array[String])
+    extends AntRunner(srcDir, compilationPaths, javaCmd, javacCmd, scalacArgs) {
   override def error(msg: String): Nothing = sys.error(msg)
   def echo(msg: String): Unit = loggers foreach { l => l.info(msg) }
   def log(msg: String): Unit = loggers foreach { l => l.debug(msg) }

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

@@ -19,9 +19,10 @@ class ConsoleRunner(argstr: String) extends {
 } with ConsoleRunnerSpec with Instance {
 
   val suiteRunner = new SuiteRunner (
-    new ConsoleFileManager(if (optPack) Some("build/pack") else optBuildPath, optClassPath),
-    optUpdateCheck,
-    optFailed)
+    testSourcePath = optSourcePath.map(_.getAbsolutePath) getOrElse PartestDefaults.sourcePath,
+    fileManager = new ConsoleFileManager(if (optPack) Some("build/pack") else optBuildPath, optClassPath),
+    updateCheck = optUpdateCheck,
+    failed = optFailed)
   import suiteRunner._
   import NestUI._
   import NestUI.color._
@@ -109,7 +110,6 @@ class ConsoleRunner(argstr: String) extends {
         echoWarning(s"Discarding ${invalid.size} invalid test paths")
     }
 
-    optSourcePath foreach (PathSettings.testSourcePath = _)
     optTimeout foreach (x => setProp("partest.timeout", x))
 
     NestUI echo banner

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

@@ -20,24 +20,7 @@ import Path._
  * NOTE: the members are methods because `testSourcePath` changes.
  */
 object PathSettings {
-  private[this] var myTestSourcePath: String = null
-  private def defaultSrcDirName              = propOrElse("partest.srcdir", "files")
-
-  /** testSourcePath determines where we look for tests, relative to the `testRoot`
-   * after it's been read, it cannot be changed
-   */
-  def testSourcePath: String = {
-    if (myTestSourcePath eq null) myTestSourcePath = defaultSrcDirName
-    myTestSourcePath
-  }
-
-  /** testSourcePath determines where we look for tests, relative to the `testRoot`
-   * it can be set only if it hasn't been read yet
-   */
-  def testSourcePath_= (path: String): Unit = {
-    // assert(myTestSourcePath eq null, "Test Source Path set after use.")
-    myTestSourcePath = path
-  }
+  private[nest] var testSourcePath: String = null // set by RunnerSuite
 
   // defaults can be set using the environment, but note PathSettings is mutable
   private def defaultTestRootName  = propOrNone("partest.root")

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

@@ -735,6 +735,7 @@ class Runner(val testFile: File, val suiteRunner: SuiteRunner) {
 
 /** Extended by Ant- and ConsoleRunner for running a set of tests. */
 class SuiteRunner(
+  val testSourcePath: String,
   val fileManager: FileManager,
   val updateCheck: Boolean,
   val failed: Boolean,
@@ -745,7 +746,10 @@ class SuiteRunner(
   import PartestDefaults.{ numThreads, waitTime }
 
   setUncaughtHandler
-  
+
+  // TODO: make this immutable
+  PathSettings.testSourcePath = testSourcePath
+
   def banner = {
     def relativize(path: String) = path.replace(fileManager.baseDir.toString, "$baseDir").replace(PathSettings.srcDir.toString, "$sourceDir")
     val vmBin  = javaHome + fileSeparator + "bin"