Skip to content

Fix separate compilation tests failing under coverage #25604

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

Open
anatoliykmetyuk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix separate compilation tests failing under coverage #25604

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
4 changes: 0 additions & 4 deletions compiler/test/dotc/scoverage-ignore.excludelist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,8 @@
# Empty lines are ignored

16583.scala
alphanumeric-infix-operator-compat
annotation-named-pararamters
applied_constructor_types.scala
backwardCompat-3.0
backwardCompat-3.1
backwardsCompat-implicitParens
bridges.scala
capt1.scala
capture.scala
Expand Down
11 changes: 10 additions & 1 deletion compiler/test/dotty/tools/vulpix/ParallelTesting.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,15 @@ trait ParallelTesting extends RunnerOrchestration with CoverageSupport:
addToLast(barLine(start = false))
diagnostics.reverse

/** Older compilers don't support `-coverage-out` or `-Ycheck:instrumentCoverage`. */
private def stripCoverageOptions(flags: TestFlags): TestFlags =
def loop(opts: List[String]): List[String] = opts match
case "-coverage-out" :: _ :: tail => loop(tail)
case flag :: tail if flag.startsWith("-Ycheck:") && flag.contains("instrumentCoverage") => loop(tail)
case other :: tail => other :: loop(tail)
case Nil => Nil
flags.copy(options = loop(flags.options.toList).toArray)

protected def compileWithOtherCompiler(compiler: String, files: Array[JFile], flags: TestFlags, targetDir: JFile): TestReporter =
def artifactClasspath(organizationName: String, moduleName: String) =
import coursier._
Expand Down Expand Up @@ -652,7 +661,7 @@ trait ParallelTesting extends RunnerOrchestration with CoverageSupport:
def scala3Command(): Array[String] = {
val stdlibClasspath = artifactClasspath("org.scala-lang", "scala3-library_3")
val scalacClasspath = artifactClasspath("org.scala-lang", "scala3-compiler_3")
val flagsArgs = flags
val flagsArgs = stripCoverageOptions(flags)
.copy(defaultClassPath = stdlibClasspath)
.withClasspath(targetDir.getPath)
.and("-d", targetDir.getPath)
Expand Down
Loading