[K/N] Remove LLVM coverage
The -Xcoverage feature has not worked and has been disabled for a while. This fix removes it, and all of its uses. Co-authored-by: Troels Lund <troels@google.com> Merge-request: KOTLIN-MR-821 Merged-by: Alexander Shabalin <alexander.shabalin@jetbrains.com>
This commit is contained in:
Troels Bjerre Lund
committed by
Space Cloud
Space Cloud
parent
e0c931f69d
commit
4f77434ea5
@@ -1,145 +0,0 @@
|
||||
/*
|
||||
* Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
|
||||
* that can be found in the LICENSE file.
|
||||
*/
|
||||
|
||||
package org.jetbrains.kotlin
|
||||
|
||||
import groovy.lang.Closure
|
||||
import org.gradle.api.DefaultTask
|
||||
import org.gradle.api.Task
|
||||
import org.gradle.api.tasks.Input
|
||||
import org.gradle.api.tasks.TaskAction
|
||||
import org.gradle.api.tasks.Internal
|
||||
import org.jetbrains.kotlin.konan.target.AppleConfigurables
|
||||
|
||||
/**
|
||||
* Test task for -Xcoverage and -Xlibraries-to-cover flags. Requires a binary to be built by the Konan plugin
|
||||
* with
|
||||
* konanArtifacts {
|
||||
* program([binaryName], targets: [testTarget]) {
|
||||
* ...
|
||||
* extraOpts "-Xcoverage"/"-Xlibrary-to-cover=...", "-Xcoverage-file=$[profrawFile]"
|
||||
* }
|
||||
* }
|
||||
* and a dependency set according to a pattern "run${binaryName}".
|
||||
*
|
||||
* @property numberOfCoveredFunctions Expected number of covered functions
|
||||
* @property numberOfCoveredLines Expected number of covered lines in all functions
|
||||
* @property binaryName Name of the produced binary
|
||||
*/
|
||||
open class CoverageTest : DefaultTask() {
|
||||
|
||||
private val target = project.testTarget
|
||||
private val platform = project.platformManager.platform(target)
|
||||
private val configurables = platform.configurables
|
||||
|
||||
// Use the same LLVM version as compiler when producing machine code:
|
||||
private val llvmToolsDir = if (configurables is AppleConfigurables) {
|
||||
"${configurables.absoluteTargetToolchain}/usr/bin"
|
||||
} else {
|
||||
"${configurables.absoluteLlvmHome}/bin"
|
||||
}
|
||||
|
||||
@Input
|
||||
lateinit var binaryName: String
|
||||
|
||||
// TODO: Consider better metric.
|
||||
@Input
|
||||
var numberOfCoveredFunctions: Int? = null
|
||||
@Input
|
||||
var numberOfCoveredLines: Int? = null
|
||||
|
||||
@get:Internal
|
||||
val profrawFile: String by lazy {
|
||||
"${project.buildDir.absolutePath}/$binaryName.profraw"
|
||||
}
|
||||
|
||||
private val profdataFile: String by lazy {
|
||||
"${project.buildDir.absolutePath}/$binaryName.profdata"
|
||||
}
|
||||
|
||||
private val outputDir: String by lazy {
|
||||
project.file(project.property("testOutputCoverage")!!).absolutePath
|
||||
}
|
||||
|
||||
override fun configure(closure: Closure<Any>): Task {
|
||||
super.configure(closure)
|
||||
dependsOnDist()
|
||||
val compileBinaryTask = project.tasks.named("compileKonan$binaryName").configure {
|
||||
konanOldPluginTaskDependenciesWalker {
|
||||
dependsOnDist()
|
||||
}
|
||||
}
|
||||
dependsOn(compileBinaryTask)
|
||||
return this
|
||||
}
|
||||
|
||||
@TaskAction
|
||||
fun run() {
|
||||
val suffix = target.family.exeSuffix
|
||||
val pathToBinary = "$outputDir/$binaryName/$target/$binaryName.$suffix"
|
||||
runProcess({ project.executor.execute(it) }, pathToBinary)
|
||||
.ensureSuccessful(pathToBinary)
|
||||
exec("llvm-profdata", "merge", profrawFile, "-o", profdataFile)
|
||||
val llvmCovResult = exec("llvm-cov", "export", pathToBinary, "-instr-profile", profdataFile)
|
||||
val jsonReport = llvmCovResult.stdOut
|
||||
val llvmCovReport = parseLlvmCovReport(jsonReport)
|
||||
try {
|
||||
CoverageValidator(numberOfCoveredFunctions, numberOfCoveredLines).validateReport(llvmCovReport)
|
||||
} catch (e: TestFailedException) {
|
||||
// Show report in message to make debug easier.
|
||||
val show = exec("llvm-cov", "show", pathToBinary, "-instr-profile", profdataFile).stdOut
|
||||
// llvm-cov output contains '|' so another symbol is used as margin prefix.
|
||||
throw TestFailedException("""
|
||||
>${e.message}
|
||||
>$show
|
||||
""".trimMargin(">"))
|
||||
}
|
||||
}
|
||||
|
||||
private fun exec(llvmTool: String, vararg args: String): ProcessOutput {
|
||||
val executable = "$llvmToolsDir/$llvmTool"
|
||||
val result = runProcess(localExecutor(project), executable, args.toList())
|
||||
result.ensureSuccessful(llvmTool)
|
||||
return result
|
||||
}
|
||||
|
||||
private fun ProcessOutput.ensureSuccessful(executable: String) {
|
||||
if (exitCode != 0) {
|
||||
println("""
|
||||
$executable failed.
|
||||
exitCode: $exitCode
|
||||
stdout:
|
||||
$stdOut
|
||||
stderr:
|
||||
$stdErr
|
||||
""".trimIndent())
|
||||
error("$executable failed")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private class CoverageValidator(
|
||||
val numberOfCoveredFunctions: Int?,
|
||||
val numberOfCoveredLines: Int?
|
||||
) {
|
||||
fun validateReport(report: LlvmCovReport) {
|
||||
val data = report.data
|
||||
if (data.isEmpty()) {
|
||||
failTest("Report data should not be empty!")
|
||||
}
|
||||
compareNumbers(numberOfCoveredFunctions, data[0].totals.functions.covered, "Number of covered functions")
|
||||
compareNumbers(numberOfCoveredLines, data[0].totals.lines.covered, "Number of covered lines")
|
||||
}
|
||||
|
||||
private fun compareNumbers(expected: Int?, actual: Int, description: String) {
|
||||
if (expected != null && actual != expected) {
|
||||
failTest("$description differs from expected! Expected: $expected. Got: $actual")
|
||||
}
|
||||
}
|
||||
|
||||
private fun failTest(message: String) {
|
||||
throw TestFailedException(message)
|
||||
}
|
||||
}
|
||||
@@ -115,9 +115,6 @@ val Project.globalBuildArgs: List<String>
|
||||
val Project.globalTestArgs: List<String>
|
||||
get() = project.groovyPropertyArrayToList("globalTestArgs")
|
||||
|
||||
val Project.testTargetSupportsCodeCoverage: Boolean
|
||||
get() = this.testTarget.supportsCodeCoverage()
|
||||
|
||||
fun projectOrFiles(proj: Project, notation: String): Any? {
|
||||
val propertyMapper = proj.findProperty("notationMapping") ?: return proj.project(notation)
|
||||
val mapping = (propertyMapper as? Map<*, *>)?.get(notation) as? String ?: return proj.project(notation)
|
||||
|
||||
+1
-3
@@ -130,10 +130,8 @@ abstract class KonanCompileTask: KonanBuildingTask(), KonanCompileSpec {
|
||||
return result
|
||||
}
|
||||
|
||||
// Don't include coverage flags into the first stage because they are not supported when compiling a klib.
|
||||
private fun firstStageExtraOpts() = extraOpts
|
||||
.excludeFlags("-Xcoverage")
|
||||
.excludeArguments("-Xcoverage-file", "-Xlibrary-to-cover", "-Xpartial-linkage", "-Xpartial-linkage-loglevel")
|
||||
.excludeArguments("-Xpartial-linkage", "-Xpartial-linkage-loglevel")
|
||||
|
||||
// Don't include the -Xemit-lazy-objc-header and -language-version flags into
|
||||
// the second stage because this stage have no sources.
|
||||
|
||||
Reference in New Issue
Block a user