Merge pull request scala#10789 from som-snytt/tweak/relative-path-in-test

Appease windows paths perhaps

Author: lrytz

test/files/run/t12289.scala

@@ -1,6 +1,7 @@
 
-import scala.tools.partest.StoreReporterDirectTest
+import scala.reflect.io.AbstractFile
 import scala.tools.nsc._
+import scala.tools.partest.StoreReporterDirectTest
 import scala.util.chaining._
 
 object Test extends StoreReporterDirectTest {
@@ -15,13 +16,14 @@ object Test extends StoreReporterDirectTest {
   def code = rounds(round).tap(_ => round += 1)
   // intercept the settings created for compile()
   override def newSettings(args: List[String]) = {
-    val outDir = testOutput.parent / testOutput / s"test-output-$round"
-    def prevOutDir = testOutput.parent / testOutput / s"test-output-${round - 1}"
-    outDir.createDirectory()
+    val outDir = testOutput / s"test-output-$round"
+    def prevOutDir = testOutput / s"test-output-${round - 1}"
+    outDir.createDirectory(force = true)
+    val af = AbstractFile.getDirectory(outDir)
     // put the previous round on the class path
-    val args1 = "-d" :: outDir.path :: args
-    val args2 = if (round > 0) "-cp" :: prevOutDir.path :: args1 else args1
-    super.newSettings(args2)
+    val args1 = if (round > 0) "-cp" :: prevOutDir.path :: args else args
+    super.newSettings(args1)
+      .tap(_.outputDirs.setSingleOutput(af))
   }
   // avoid setting -d
   override def newCompiler(args: String*): Global = {

test/files/run/t12289b.scala

@@ -1,6 +1,7 @@
 
-import scala.tools.partest.StoreReporterDirectTest
+import scala.reflect.io.AbstractFile
 import scala.tools.nsc._
+import scala.tools.partest.StoreReporterDirectTest
 import scala.util.chaining._
 
 object Test extends StoreReporterDirectTest {
@@ -17,13 +18,14 @@ object Test extends StoreReporterDirectTest {
   def code = rounds(round).tap(_ => round += 1)
   // intercept the settings created for compile()
   override def newSettings(args: List[String]) = {
-    val outDir = testOutput.parent / testOutput / s"test-output-$round"
-    def prevOutDir = testOutput.parent / testOutput / s"test-output-${round - 1}"
-    outDir.createDirectory()
+    val outDir = testOutput / s"test-output-$round"
+    def prevOutDir = testOutput / s"test-output-${round - 1}"
+    outDir.createDirectory(force = true)
+    val af = AbstractFile.getDirectory(outDir)
     // put the previous round on the class path
-    val args1 = "-d" :: outDir.path :: args
-    val args2 = if (round > 0) "-cp" :: prevOutDir.path :: args1 else args1
-    super.newSettings(args2)
+    val args1 = if (round > 0) "-cp" :: prevOutDir.path :: args else args
+    super.newSettings(args1)
+      .tap(_.outputDirs.setSingleOutput(af))
   }
   // avoid setting -d
   override def newCompiler(args: String*): Global = {

test/files/run/t12289c.scala

@@ -1,6 +1,6 @@
 
-import scala.tools.partest.StoreReporterDirectTest
 import scala.tools.nsc._
+import scala.tools.partest.StoreReporterDirectTest
 import scala.util.chaining._
 
 object Test extends StoreReporterDirectTest {
@@ -16,15 +16,13 @@ object Test extends StoreReporterDirectTest {
     else code1.tap(_ => round += 1)
   // intercept the settings created for compile()
   override def newSettings(args: List[String]) = {
-    val outDir = testOutput.parent / testOutput / s"test-output-$round"
-    def prevOutDir = testOutput.parent / testOutput / s"test-output-${round - 1}"
-    outDir.createDirectory()
+    val outDir = testOutput / s"test-output-$round"
+    def prevOutDir = testOutput / s"test-output-${round - 1}"
+    outDir.createDirectory(force = true)
     // put the previous round on the class path
-    val ss =
-      if (round > 0) super.newSettings("-cp" :: prevOutDir.path :: args)
-      else super.newSettings(args)
-    ss.outputDirs.add(srcDir = testPath.parent.path, outDir = outDir.path)
-    ss
+    val args1 = if (round > 0) "-cp" :: prevOutDir.path :: args else args
+    super.newSettings(args1)
+      .tap(_.outputDirs.add(srcDir = testPath.parent.path, outDir = outDir.path))
   }
   // avoid setting -d
   override def newCompiler(args: String*): Global = {