Skip to content

Commit 55c8b6c

Browse files
authored
Rename BestEffortCompilationTests to not run them in testCompilation (#20219)
I didn't realize testCompilation used `*CompilationTests` glob to run the tests there. BestEffortCompilationTests (now BestEffortOptionsTests) shouldn't be run there, as that is impractical for working on most issues/additions in this repo. Fixed by renaming the tests. Apologies for the inconvenience!
2 parents 8c0203b + 25334fd commit 55c8b6c

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

compiler/test/dotty/tools/dotc/BestEffortCompilationTests.scala renamed to compiler/test/dotty/tools/dotc/BestEffortOptionsTests.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import java.io.{File => JFile}
1010

1111
import scala.language.unsafeNulls
1212

13-
class BestEffortCompilationTests {
13+
class BestEffortOptionsTests {
1414
import ParallelTesting._
1515
import vulpix.TestConfiguration._
16-
import BestEffortCompilationTests._
16+
import BestEffortOptionsTests._
1717
import CompilationTest.aggregateTests
1818

1919
// Since TASTy and beTASTy files are read in a lazy manner (only when referenced by the source .scala file)
@@ -42,7 +42,7 @@ class BestEffortCompilationTests {
4242
}
4343
}
4444

45-
object BestEffortCompilationTests extends ParallelTesting {
45+
object BestEffortOptionsTests extends ParallelTesting {
4646
def maxDuration = 45.seconds
4747
def numberOfSlaves = Runtime.getRuntime.availableProcessors()
4848
def safeMode = Properties.testsSafeMode

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1610,7 +1610,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
16101610
* '-Ywith-best-effort-tasty' to test the TastyReader for Best Effort TASTy.
16111611
*/
16121612
def compileBestEffortTastyInDir(f: String, flags: TestFlags, picklingFilter: FileFilter, unpicklingFilter: FileFilter)(
1613-
implicit testGroup: TestGroup): BestEffortCompilationTest = {
1613+
implicit testGroup: TestGroup): BestEffortOptionsTest = {
16141614
val bestEffortFlag = "-Ybest-effort"
16151615
val semanticDbFlag = "-Xsemanticdb"
16161616
assert(!flags.options.contains(bestEffortFlag), "Best effort compilation flag should not be added manually")
@@ -1687,7 +1687,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
16871687
new CompilationFromBestEffortTasty(testGroup.name, f, flags, bestEffortDir)
16881688
}
16891689

1690-
new BestEffortCompilationTest(
1690+
new BestEffortOptionsTest(
16911691
new CompilationTest(bestEffortTargets).keepOutput,
16921692
new CompilationTest(fromTastyTargets).keepOutput,
16931693
bestEffortDirs,
@@ -1735,7 +1735,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
17351735
(step1Compilation, step2Compilation, bestEffortDir)
17361736
}.unzip3
17371737

1738-
BestEffortCompilationTest(
1738+
BestEffortOptionsTest(
17391739
new CompilationTest(step1Targets).keepOutput,
17401740
new CompilationTest(step2Targets).keepOutput,
17411741
bestEffortDirs,
@@ -1770,7 +1770,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
17701770
}
17711771
}
17721772

1773-
class BestEffortCompilationTest(step1: CompilationTest, step2: CompilationTest, bestEffortDirs: List[JFile], shouldDelete: Boolean)(implicit testGroup: TestGroup) {
1773+
class BestEffortOptionsTest(step1: CompilationTest, step2: CompilationTest, bestEffortDirs: List[JFile], shouldDelete: Boolean)(implicit testGroup: TestGroup) {
17741774

17751775
def checkNoCrash()(implicit summaryReport: SummaryReporting): this.type = {
17761776
step1.checkNoBestEffortError() // Compile all files to generate the class files with best effort tasty

0 commit comments

Comments
 (0)