Skip to content

Commit 9af5e08

Browse files
Set baseDirectory to / ".." in tests
1 parent ba2fb3c commit 9af5e08

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ trait ParallelTesting extends RunnerOrchestration { self =>
5555

5656
def runClassPath: String = outDir.getAbsolutePath + ":" + flags.runClassPath
5757

58-
def title: String = (self match {
58+
def title: String = self match {
5959
case self: JointCompilationSource =>
6060
if (self.files.length > 1) name
6161
else self.files.head.getPath
6262

6363
case self: SeparateCompilationSource =>
6464
self.dir.getPath
65-
}).stripPrefix("../")
65+
}
6666

6767
/** Adds the flags specified in `newFlags0` if they do not already exist */
6868
def withFlags(newFlags0: String*) = {

project/Build.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -496,9 +496,7 @@ object Build {
496496
),
497497

498498
// For convenience, change the baseDirectory when running the compiler
499-
baseDirectory in (Compile, run) := baseDirectory.value / "..",
500-
// .. but not when running test
501-
baseDirectory in (Test, run) := baseDirectory.value,
499+
baseDirectory in run := baseDirectory.value / "..",
502500

503501
test in Test := {
504502
// Exclude legacy tests by default

0 commit comments

Comments
 (0)