azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Test] Report backend diagnostics from dependant MPP modules for FIR codegen tests

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2023-08-01 14:57:39 +03:00
committed by Space Team
parent 48c148473f
commit 2c91ae1129
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/JvmBackendDiagnosticsHandler.kt
+19 -9
View File
@@ -24,11 +24,9 @@ import org.jetbrains.kotlin.test.frontend.classic.handlers.withNewInferenceModeE
import org.jetbrains.kotlin.test.frontend.fir.handlers.FirDiagnosticCodeMetaInfo import org.jetbrains.kotlin.test.frontend.fir.handlers.FirDiagnosticCodeMetaInfo
import org.jetbrains.kotlin.test.frontend.fir.handlers.toMetaInfos import org.jetbrains.kotlin.test.frontend.fir.handlers.toMetaInfos
import org.jetbrains.kotlin.test.model.BinaryArtifacts import org.jetbrains.kotlin.test.model.BinaryArtifacts
import org.jetbrains.kotlin.test.model.DependencyKind
import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.*
import org.jetbrains.kotlin.test.services.assertions
import org.jetbrains.kotlin.test.services.globalMetadataInfoHandler
import org.jetbrains.kotlin.test.services.sourceFileProvider
import org.jetbrains.kotlin.util.capitalizeDecapitalize.toLowerCaseAsciiOnly import org.jetbrains.kotlin.util.capitalizeDecapitalize.toLowerCaseAsciiOnly
import org.junit.jupiter.api.fail import org.junit.jupiter.api.fail
import java.io.File import java.io.File
@@ -63,13 +61,25 @@ class JvmBackendDiagnosticsHandler(testServices: TestServices) : JvmBinaryArtifa
val firParser = module.directives.singleOrZeroValue(FirDiagnosticsDirectives.FIR_PARSER) val firParser = module.directives.singleOrZeroValue(FirDiagnosticsDirectives.FIR_PARSER)
val lightTreeComparingModeEnabled = firParser != null && FirDiagnosticsDirectives.COMPARE_WITH_LIGHT_TREE in module.directives val lightTreeComparingModeEnabled = firParser != null && FirDiagnosticsDirectives.COMPARE_WITH_LIGHT_TREE in module.directives
val lightTreeEnabled = firParser == FirParser.LightTree val lightTreeEnabled = firParser == FirParser.LightTree
for (testFile in module.files) {
val ktDiagnostics = ktDiagnosticReporter.diagnosticsByFilePath["/${testFile.name}"] ?: continue val processedModules = mutableSetOf<TestModule>()
ktDiagnostics.forEach {
val metaInfos = it.toMetaInfos(module, testFile, globalMetadataInfoHandler, lightTreeEnabled, lightTreeComparingModeEnabled) fun processModule(module: TestModule) {
globalMetadataInfoHandler.addMetadataInfosForFile(testFile, metaInfos) if (!processedModules.add(module)) return
for (testFile in module.files) {
val ktDiagnostics = ktDiagnosticReporter.diagnosticsByFilePath["/${testFile.name}"] ?: continue
ktDiagnostics.forEach {
val metaInfos = it.toMetaInfos(module, testFile, globalMetadataInfoHandler, lightTreeEnabled, lightTreeComparingModeEnabled)
globalMetadataInfoHandler.addMetadataInfosForFile(testFile, metaInfos)
}
}
for ((moduleName, _, _) in module.dependsOnDependencies) {
val dependantModule = testServices.dependencyProvider.getTestModule(moduleName)
processModule(dependantModule)
} }
} }
processModule(module)
} }
private fun checkFullDiagnosticRender(module: TestModule) { private fun checkFullDiagnosticRender(module: TestModule) {