Skip to content

Rename BestEffortCompilationTests to not run them in testCompilation #20219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 18, 2024
Merged

Rename BestEffortCompilationTests to not run them in testCompilation #20219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...ols/dotc/BestEffortCompilationTests.scala → ...y/tools/dotc/BestEffortOptionsTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import java.io.{File => JFile}

import scala.language.unsafeNulls

class BestEffortCompilationTests {
class BestEffortOptionsTests {
import ParallelTesting._
import vulpix.TestConfiguration._
import BestEffortCompilationTests._
import BestEffortOptionsTests._
import CompilationTest.aggregateTests

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

object BestEffortCompilationTests extends ParallelTesting {
object BestEffortOptionsTests extends ParallelTesting {
def maxDuration = 45.seconds
def numberOfSlaves = Runtime.getRuntime.availableProcessors()
def safeMode = Properties.testsSafeMode
Expand Down
8 changes: 4 additions & 4 deletions compiler/test/dotty/tools/vulpix/ParallelTesting.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1610,7 +1610,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
* '-Ywith-best-effort-tasty' to test the TastyReader for Best Effort TASTy.
*/
def compileBestEffortTastyInDir(f: String, flags: TestFlags, picklingFilter: FileFilter, unpicklingFilter: FileFilter)(
implicit testGroup: TestGroup): BestEffortCompilationTest = {
implicit testGroup: TestGroup): BestEffortOptionsTest = {
val bestEffortFlag = "-Ybest-effort"
val semanticDbFlag = "-Xsemanticdb"
assert(!flags.options.contains(bestEffortFlag), "Best effort compilation flag should not be added manually")
Expand Down Expand Up @@ -1687,7 +1687,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
new CompilationFromBestEffortTasty(testGroup.name, f, flags, bestEffortDir)
}

new BestEffortCompilationTest(
new BestEffortOptionsTest(
new CompilationTest(bestEffortTargets).keepOutput,
new CompilationTest(fromTastyTargets).keepOutput,
bestEffortDirs,
Expand Down Expand Up @@ -1735,7 +1735,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
(step1Compilation, step2Compilation, bestEffortDir)
}.unzip3

BestEffortCompilationTest(
BestEffortOptionsTest(
new CompilationTest(step1Targets).keepOutput,
new CompilationTest(step2Targets).keepOutput,
bestEffortDirs,
Expand Down Expand Up @@ -1770,7 +1770,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
}
}

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

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