Merge pull request #4049 from dotty-staging/fix-#4048

Fix path to `dotty/out`

Author: allanrenucci

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

@@ -297,9 +297,9 @@ class CompilationTests extends ParallelTesting {
       }.keepOutput :: Nil
     }.map(_.checkCompile())
 
-    assert(new java.io.File(s"../out/$dotty1Group/dotty/").exists)
-    assert(new java.io.File(s"../out/$dotty2Group/dotty/").exists)
-    assert(new java.io.File(s"../out/$libGroup/src/").exists)
+    assert(new java.io.File(s"out/$dotty1Group/dotty/").exists)
+    assert(new java.io.File(s"out/$dotty2Group/dotty/").exists)
+    assert(new java.io.File(s"out/$libGroup/src/").exists)
     compileList("idempotency", List("tests/idempotency/BootstrapChecker.scala", "tests/idempotency/IdempotencyCheck.scala"), defaultOptions).checkRuns()
 
     tests.foreach(_.delete())

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

@@ -22,7 +22,7 @@ class InterfaceEntryPointTest {
   @Test def runCompilerFromInterface = {
     val sources =
       List("tests/pos/HelloWorld.scala").map(p => Paths.get(p).toAbsolutePath().toString)
-    val out = Paths.get("../out/").toAbsolutePath()
+    val out = Paths.get("out/").toAbsolutePath()
     if (Files.notExists(out))
       Files.createDirectory(out)
 

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

@@ -20,7 +20,7 @@ class SettingsTests {
   @Test def jarOutput: Unit = {
     val classPath = mkClassPath(Jars.dottyTestDeps)
     val source = "tests/pos/Foo.scala"
-    val out = Paths.get("../out/jaredFoo.jar").normalize
+    val out = Paths.get("out/jaredFoo.jar").normalize
     if (Files.exists(out)) Files.delete(out)
     val options = Array("-classpath", classPath, "-d", out.toString, source)
     val reporter = Main.process(options)

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

@@ -1312,7 +1312,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
 
 object ParallelTesting {
 
-  def defaultOutputDir: String = "../out/"
+  def defaultOutputDir: String = "out/"
 
   def isSourceFile(f: JFile): Boolean = {
     val name = f.getName

tests/idempotency/BootstrapChecker.scala

@@ -1,5 +1,5 @@
 
 object Test {
   def main(args: Array[String]): Unit =
-    IdempotencyCheck.checkIdempotency("../out/tastyBootstrap/dotty1", "../out/tastyBootstrap/dotty2")
+    IdempotencyCheck.checkIdempotency("out/tastyBootstrap/dotty1", "out/tastyBootstrap/dotty2")
 }

tests/idempotency/CheckOrderIdempotency.scala

@@ -1,5 +1,5 @@
 
 object Test {
   def main(args: Array[String]): Unit =
-    IdempotencyCheck.checkIdempotency("../out/idempotency/orderIdempotency1", "../out/idempotency/orderIdempotency2")
+    IdempotencyCheck.checkIdempotency("out/idempotency/orderIdempotency1", "out/idempotency/orderIdempotency2")
 }

tests/idempotency/CheckPosIdempotency.scala

@@ -1,5 +1,5 @@
 
 object Test {
   def main(args: Array[String]): Unit =
-    IdempotencyCheck.checkIdempotency("../out/idempotency/posIdempotency1", "../out/idempotency/posIdempotency2")
+    IdempotencyCheck.checkIdempotency("out/idempotency/posIdempotency1", "out/idempotency/posIdempotency2")
 }

tests/idempotency/CheckStrawmanIdempotency.scala

@@ -1,11 +1,11 @@
 
 object Test {
   def main(args: Array[String]): Unit = {
-    IdempotencyCheck.checkIdempotency("../out/idempotency/strawman0", "../out/idempotency/strawman1")
+    IdempotencyCheck.checkIdempotency("out/idempotency/strawman0", "out/idempotency/strawman1")
     // FIXME: #2964 and maybe more
     /*
-    IdempotencyCheck.checkIdempotency("../out/idempotency/strawman1", "../out/idempotency/strawman2")
-    IdempotencyCheck.checkIdempotency("../out/idempotency/strawman1", "../out/idempotency/strawman3")
+    IdempotencyCheck.checkIdempotency("out/idempotency/strawman1", "out/idempotency/strawman2")
+    IdempotencyCheck.checkIdempotency("out/idempotency/strawman1", "out/idempotency/strawman3")
     */
   }
 }

tests/pos/lambda.decompiled

@@ -1,5 +1,5 @@
 ================================================================================
-../out/posTestFromTasty/pos/lambda/foo/Foo.class
+out/posTestFromTasty/pos/lambda/foo/Foo.class
 --------------------------------------------------------------------------------
 package foo {
   class Foo() extends Object() {

tests/pos/methodTypes.decompiled

@@ -1,5 +1,5 @@
 ================================================================================
-../out/posTestFromTasty/pos/methodTypes/Foo.class
+out/posTestFromTasty/pos/methodTypes/Foo.class
 --------------------------------------------------------------------------------
 package <empty> {
   class Foo() extends Object() {

tests/pos/simpleCaseObject.decompiled

@@ -1,5 +1,5 @@
 ================================================================================
-../out/posTestFromTasty/pos/simpleCaseObject/foo/Foo.class
+out/posTestFromTasty/pos/simpleCaseObject/foo/Foo.class
 --------------------------------------------------------------------------------
 package foo {
   case object Foo() extends Object() with _root_.scala.Product {

tests/pos/simpleClass.decompiled

@@ -1,5 +1,5 @@
 ================================================================================
-../out/posTestFromTasty/pos/simpleClass/foo/A.class
+out/posTestFromTasty/pos/simpleClass/foo/A.class
 --------------------------------------------------------------------------------
 package foo {
   class A() extends Object() {}

tests/run-with-compiler/quote-run-with-settings.scala

@@ -16,7 +16,7 @@ object Test {
     println(expr.run)
     println()
 
-    val outDir = Paths.get("../out/out-quoted-1")
+    val outDir = Paths.get("out/out-quoted-1")
     val classFile = outDir.resolve("Quoted.class")
 
     Files.deleteIfExists(classFile)

tests/run/puzzle.decompiled

@@ -1,5 +1,5 @@
 ================================================================================
-../out/runTestFromTasty/run/puzzle/Test.class
+out/runTestFromTasty/run/puzzle/Test.class
 --------------------------------------------------------------------------------
 package <empty> {
   object Test() extends Object() { this: Test.type =>

tests/vulpix-tests/meta/sbt-output.check

@@ -15,7 +15,7 @@ Diff (expected on the left, actual right):
 [info] Test dotty.tools.vulpix.VulpixMetaTests.compileNeg started
 Testing tests/vulpix-tests/meta/neg/missing-error-annotation.scala
 
-Wrong number of errors encountered when compiling ../out/VulpixMetaTests/neg/missing-error-annotation, expected: 0, actual: 2
+Wrong number of errors encountered when compiling out/VulpixMetaTests/neg/missing-error-annotation, expected: 0, actual: 2
 [error] Test dotty.tools.vulpix.VulpixMetaTests.compileNeg failed: java.lang.AssertionError: Neg test shouldn't have failed, but did. Reasons:
 [error]
 [error]   - encountered 2 error(s), took 0.093 sec SKIP