Skip to content

Commit 976ba4b

Browse files
committed
Make decompliation test output stable on different filesystems
1 parent e6130d9 commit 976ba4b

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
433433

434434
def hasTastyFileToClassName(f: JFile): String =
435435
targetDir.toPath.relativize(f.toPath).toString.dropRight(".hasTasty".length).replace('/', '.')
436-
val classes = flattenFiles(targetDir).filter(isHasTastyFile).map(hasTastyFileToClassName)
436+
val classes = flattenFiles(targetDir).filter(isHasTastyFile).map(hasTastyFileToClassName).sorted
437437

438438
val reporter =
439439
TestReporter.reporter(realStdout, logLevel =

tests/pos/simpleClass-2.decompiled

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
================================================================================
2-
out/posTestFromTasty/pos2/simpleClass-2/foo/B.class
2+
out/posTestFromTasty/pos/simpleClass-2/foo/A.class
33
--------------------------------------------------------------------------------
44
package foo {
5-
class B() extends Object() {}
5+
class A() extends foo.B() {}
66
}
77
--------------------------------------------------------------------------------
88
================================================================================
9-
out/posTestFromTasty/pos2/simpleClass-2/foo/A.class
9+
out/posTestFromTasty/pos/simpleClass-2/foo/B.class
1010
--------------------------------------------------------------------------------
1111
package foo {
12-
class A() extends foo.B() {}
12+
class B() extends Object() {}
1313
}
1414
--------------------------------------------------------------------------------

tests/pos/simpleClass.decompiled

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
================================================================================
2-
out/posTestFromTasty/pos2/simpleClass/foo/B.class
2+
out/posTestFromTasty/pos/simpleClass/foo/A.class
33
--------------------------------------------------------------------------------
44
package foo {
5-
class B() extends foo.A() {}
5+
class A() extends Object() {}
66
}
77
--------------------------------------------------------------------------------
88
================================================================================
9-
out/posTestFromTasty/pos2/simpleClass/foo/A.class
9+
out/posTestFromTasty/pos/simpleClass/foo/B.class
1010
--------------------------------------------------------------------------------
1111
package foo {
12-
class A() extends Object() {}
12+
class B() extends foo.A() {}
1313
}
1414
--------------------------------------------------------------------------------

0 commit comments

Comments
 (0)