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

[MPP][Test] MPPCompositeMode: Include transitive dependsOn dependencies

Browse Source 
^KT-50156
This commit is contained in:
sebastian.sellmair
2021-12-22 11:02:26 +01:00
committed by Space
parent 8880ea1c16
commit a6bc8807e5
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/MultiplatformAnalysisConfiguration.kt
+7 -1
View File
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.resolve.multiplatform.isCommonSource
import org.jetbrains.kotlin.test.directives.MultiplatformDiagnosticsDirectives.ENABLE_MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE import org.jetbrains.kotlin.test.directives.MultiplatformDiagnosticsDirectives.ENABLE_MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE
import org.jetbrains.kotlin.test.model.* import org.jetbrains.kotlin.test.model.*
import org.jetbrains.kotlin.test.services.* import org.jetbrains.kotlin.test.services.*
import org.jetbrains.kotlin.types.typeUtil.closure
internal fun MultiplatformAnalysisConfiguration(testServices: TestServices): MultiplatformAnalysisConfiguration { internal fun MultiplatformAnalysisConfiguration(testServices: TestServices): MultiplatformAnalysisConfiguration {
return if (testServices.moduleStructure.allDirectives.contains(ENABLE_MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE)) { return if (testServices.moduleStructure.allDirectives.contains(ENABLE_MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE)) {
@@ -121,7 +122,12 @@ internal class MultiplatformCompositeAnalysisConfiguration(
} }
override fun getDependencyDescriptors(module: TestModule): List<ModuleDescriptorImpl> { override fun getDependencyDescriptors(module: TestModule): List<ModuleDescriptorImpl> {
return getDescriptors(module.allDependencies, dependencyProvider, moduleDescriptorProvider) // Transitive dependsOn descriptors should also be returned as dependencies
val allDependsOnDependencies = module.dependsOnDependencies.closure(preserveOrder = true) { dependsOnDependency ->
dependencyProvider.getTestModule(dependsOnDependency.moduleName).dependsOnDependencies
}
val allDependencies = (module.allDependencies + allDependsOnDependencies).distinct()
return getDescriptors(allDependencies, dependencyProvider, moduleDescriptorProvider)
} }
override fun getDependsOnDescriptors(module: TestModule): List<ModuleDescriptorImpl> { override fun getDependsOnDescriptors(module: TestModule): List<ModuleDescriptorImpl> {