diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala index 1057b920f4fc..1c5efcd57de7 100644 --- a/compiler/test/dotty/tools/dotc/CompilationTests.scala +++ b/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()) diff --git a/compiler/test/dotty/tools/dotc/InterfaceEntryPointTest.scala b/compiler/test/dotty/tools/dotc/InterfaceEntryPointTest.scala index 45fb54959dfd..1967a832fcbe 100644 --- a/compiler/test/dotty/tools/dotc/InterfaceEntryPointTest.scala +++ b/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) diff --git a/compiler/test/dotty/tools/dotc/SettingsTests.scala b/compiler/test/dotty/tools/dotc/SettingsTests.scala index 4579d0af5d87..315600ddc58f 100644 --- a/compiler/test/dotty/tools/dotc/SettingsTests.scala +++ b/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) diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index e296e4de0233..47f23f957d31 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/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 diff --git a/tests/idempotency/BootstrapChecker.scala b/tests/idempotency/BootstrapChecker.scala index 1ce18d1b0c38..7c88ed597298 100644 --- a/tests/idempotency/BootstrapChecker.scala +++ b/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") } diff --git a/tests/idempotency/CheckOrderIdempotency.scala b/tests/idempotency/CheckOrderIdempotency.scala index e9e05f526ace..deb85956bd18 100644 --- a/tests/idempotency/CheckOrderIdempotency.scala +++ b/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") } diff --git a/tests/idempotency/CheckPosIdempotency.scala b/tests/idempotency/CheckPosIdempotency.scala index e07781db76c9..3e2af18a6674 100644 --- a/tests/idempotency/CheckPosIdempotency.scala +++ b/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") } diff --git a/tests/idempotency/CheckStrawmanIdempotency.scala b/tests/idempotency/CheckStrawmanIdempotency.scala index f59da4c7b3e8..c851fe9485e7 100644 --- a/tests/idempotency/CheckStrawmanIdempotency.scala +++ b/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") */ } } diff --git a/tests/pos/lambda.decompiled b/tests/pos/lambda.decompiled index 3c249e11b65f..e44e5770633a 100644 --- a/tests/pos/lambda.decompiled +++ b/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() { diff --git a/tests/pos/methodTypes.decompiled b/tests/pos/methodTypes.decompiled index 776508a9e5cd..8b49ab2b402e 100644 --- a/tests/pos/methodTypes.decompiled +++ b/tests/pos/methodTypes.decompiled @@ -1,5 +1,5 @@ ================================================================================ -../out/posTestFromTasty/pos/methodTypes/Foo.class +out/posTestFromTasty/pos/methodTypes/Foo.class -------------------------------------------------------------------------------- package { class Foo() extends Object() { diff --git a/tests/pos/simpleCaseObject.decompiled b/tests/pos/simpleCaseObject.decompiled index d06cd60b36d4..1ecd3759cb65 100644 --- a/tests/pos/simpleCaseObject.decompiled +++ b/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 { diff --git a/tests/pos/simpleClass.decompiled b/tests/pos/simpleClass.decompiled index 86b7cf6b1204..44fba6e33f55 100644 --- a/tests/pos/simpleClass.decompiled +++ b/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() {} diff --git a/tests/run-with-compiler/quote-run-with-settings.scala b/tests/run-with-compiler/quote-run-with-settings.scala index 770a51901e9a..7c4471b0b85c 100644 --- a/tests/run-with-compiler/quote-run-with-settings.scala +++ b/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) diff --git a/tests/run/puzzle.decompiled b/tests/run/puzzle.decompiled index 9254fc930534..4ce0c2cc3891 100644 --- a/tests/run/puzzle.decompiled +++ b/tests/run/puzzle.decompiled @@ -1,5 +1,5 @@ ================================================================================ -../out/runTestFromTasty/run/puzzle/Test.class +out/runTestFromTasty/run/puzzle/Test.class -------------------------------------------------------------------------------- package { object Test() extends Object() { this: Test.type => diff --git a/tests/vulpix-tests/meta/sbt-output.check b/tests/vulpix-tests/meta/sbt-output.check index 26f604786b14..65eb5cbf22f6 100644 --- a/tests/vulpix-tests/meta/sbt-output.check +++ b/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