Skip to content

Commit 31c5b75

Browse files
committed
Best effort failure excluded
1 parent 99b84e0 commit 31c5b75

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

‎compiler/test/dotc/neg-best-effort-unpickling.excludelist‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,6 @@ context-function-syntax.scala
2424

2525
# Failure to disambiguate overloaded reference
2626
i23402b.scala
27+
28+
# owner of anon, where package object has funky name
29+
i20511-1.scala

‎compiler/test/dotty/tools/dotc/BestEffortOptionsTests.scala‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,42 @@ package dotty
22
packagetools
33
packagedotc
44

5-
importscala.concurrent.duration._
6-
importdotty.tools.vulpix._
7-
importorg.junit.{Test, AfterClass }
5+
importdotty.tools.vulpix.*
86
importreporting.TestReporter
9-
importjava.io.{File=>JFile}
107

8+
importscala.concurrent.duration.*
119
importscala.language.unsafeNulls
1210

11+
importjava.io.{File=>JFile}
12+
importorg.junit.{AfterClass, Test}
13+
1314
classBestEffortOptionsTests{
14-
importParallelTesting._
15-
importvulpix.TestConfiguration._
16-
importBestEffortOptionsTests._
17-
importCompilationTest.aggregateTests
15+
importParallelTesting.*
16+
importvulpix.TestConfiguration.*
17+
importBestEffortOptionsTests.*
1818

1919
// Since TASTy and beTASTy files are read in a lazy manner (only when referenced by the source .scala file)
2020
// we test by using the "-from-tasty" option. This guarantees that the tasty files will be read
2121
// (and that the Best Effort TASTy reader will be tested), but we unfortunately skip the useful
2222
// interactions a tree derived from beTASTy could have with other frontend phases.
23-
@TestdefnegTestFromBestEffortTasty:Unit={
23+
@TestdefnegTestFromBestEffortTasty:Unit=
2424
// Can be reproduced with
2525
// > sbt
26-
// > scalac --Ybest-effort -Xsemanticdb <source>
27-
// > scalac --from-tasty -Ywith-best-effort-tasty META_INF/best-effort/<betasty>
26+
// > scalac -Ybest-effort -Xsemanticdb <source>
27+
// > scalac -from-tasty -Ywith-best-effort-tasty META_INF/best-effort/<betasty>
2828

29-
implicitvaltestGroup:TestGroup=TestGroup("negTestFromBestEffortTasty")
29+
givenTestGroup=TestGroup("negTestFromBestEffortTasty")
3030
compileBestEffortTastyInDir(s"tests${JFile.separator}neg", bestEffortBaselineOptions,
3131
picklingFilter =FileFilter.exclude(TestSources.negBestEffortPicklingExcludelisted),
3232
unpicklingFilter =FileFilter.exclude(TestSources.negBestEffortUnpicklingExcludelisted)
3333
).checkNoCrash()
34-
}
3534

3635
// Tests an actual use case of this compilation mode, where symbol definitions of the downstream
3736
// projects depend on the best effort tasty files generated with the Best Effort dir option
38-
@TestdefbestEffortIntergrationTest:Unit={
39-
implicitvaltestGroup:TestGroup=TestGroup("bestEffortIntegrationTests")
37+
@TestdefbestEffortIntegrationTest:Unit=
38+
givenTestGroup=TestGroup("bestEffortIntegrationTests")
4039
compileBestEffortIntegration(s"tests${JFile.separator}best-effort", bestEffortBaselineOptions)
4140
.noCrashWithCompilingDependencies()
42-
}
4341
}
4442

4543
objectBestEffortOptionsTestsextendsParallelTesting{

0 commit comments

Comments
(0)