Re-encode vulpix implicit output directory

Author: nicolasstucki

compiler/test/dotc/comptest.scala

@@ -1,6 +1,6 @@
 package dotc
 
-import dotty.tools.vulpix.{ParallelTesting, TestFlags}
+import dotty.tools.vulpix.{OutDirectory, ParallelTesting, TestFlags}
 
 import scala.concurrent.duration._
 
@@ -12,7 +12,7 @@ object comptest extends ParallelTesting {
   def isInteractive = true
   def testFilter = None
 
-  implicit val defaultOutputDir: String = "."
+  implicit val defaultOutputDir: OutDirectory = new OutDirectory(".")
 
   val posDir = "./tests/pos/"
   val negDir = "./tests/neg/"

compiler/test/dotty/tools/dotc/CompilationTests.scala

@@ -243,7 +243,7 @@ class CompilationTests extends ParallelTesting {
 
     def lib =
       compileDir("../library/src",
-        allowDeepSubtypes.and("-Ycheck-reentrant", "-strict", "-priorityclasspath", defaultOutputDir))
+        allowDeepSubtypes.and("-Ycheck-reentrant", "-strict", "-priorityclasspath", defaultOutputDir.toString))
 
     val compilerDir = Paths.get("../compiler/src")
     val compilerSources = sources(Files.walk(compilerDir))

compiler/test/dotty/tools/vulpix/OutDirectory.scala

@@ -0,0 +1,5 @@
+package dotty.tools.vulpix
+
+class OutDirectory(str: String) {
+  override def toString: String = str
+}

compiler/test/dotty/tools/vulpix/ParallelTesting.scala

@@ -1057,7 +1057,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
   }
 
   /** Compiles a single file from the string path `f` using the supplied flags */
-  def compileFile(f: String, flags: TestFlags)(implicit outDirectory: String): CompilationTest = {
+  def compileFile(f: String, flags: TestFlags)(implicit outDirectory: OutDirectory): CompilationTest = {
     val callingMethod = getCallingMethod()
     val sourceFile = new JFile(f)
     val parent = sourceFile.getParentFile
@@ -1087,7 +1087,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
    *  By default, files are compiled in alphabetical order. An optional seed
    *  can be used for randomization.
    */
-  def compileDir(f: String, flags: TestFlags, randomOrder: Option[Int] = None)(implicit outDirectory: String): CompilationTest = {
+  def compileDir(f: String, flags: TestFlags, randomOrder: Option[Int] = None)(implicit outDirectory: OutDirectory): CompilationTest = {
     val callingMethod = getCallingMethod()
     val outDir = outDirectory + callingMethod + "/"
     val sourceDir = new JFile(f)
@@ -1116,7 +1116,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
    *  `testName` since files can be in separate directories and or be otherwise
    *  dissociated
    */
-  def compileList(testName: String, files: List[String], flags: TestFlags, callingMethod: String = getCallingMethod())(implicit outDirectory: String): CompilationTest = {
+  def compileList(testName: String, files: List[String], flags: TestFlags, callingMethod: String = getCallingMethod())(implicit outDirectory: OutDirectory): CompilationTest = {
     val outDir = outDirectory + callingMethod + "/" + testName + "/"
 
     // Directories in which to compile all containing files with `flags`:
@@ -1147,7 +1147,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
    *  - Directories can have an associated check-file, where the check file has
    *    the same name as the directory (with the file extension `.check`)
    */
-  def compileFilesInDir(f: String, flags: TestFlags)(implicit outDirectory: String): CompilationTest = {
+  def compileFilesInDir(f: String, flags: TestFlags)(implicit outDirectory: OutDirectory): CompilationTest = {
     val callingMethod = getCallingMethod()
     val outDir = outDirectory + callingMethod + "/"
     val sourceDir = new JFile(f)
@@ -1167,7 +1167,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
    *  sub-directories and as such, does **not** perform separate compilation
    *  tests.
    */
-  def compileShallowFilesInDir(f: String, flags: TestFlags)(implicit outDirectory: String): CompilationTest = {
+  def compileShallowFilesInDir(f: String, flags: TestFlags)(implicit outDirectory: OutDirectory): CompilationTest = {
     val callingMethod = getCallingMethod()
     val outDir = outDirectory + callingMethod + "/"
     val sourceDir = new JFile(f)

compiler/test/dotty/tools/vulpix/TestConfiguration.scala

@@ -3,7 +3,7 @@ package tools
 package vulpix
 
 object TestConfiguration {
-  implicit val defaultOutputDir: String = "../out/"
+  implicit val defaultOutputDir: OutDirectory = new OutDirectory("../out/")
 
   val noCheckOptions = Array(
     "-pagewidth", "120",