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

[Test] Filter dependent modules by source kind in creating FirModuleInfo

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-02-18 12:24:21 +03:00
parent 8c95b78346
commit 7b7b8fbea7
46 changed files with 3 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/annotations/javaAnnotationArrayValueNoDefault.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_RUNTIME // WITH_RUNTIME
// MODULE: lib // MODULE: lib
compiler/testData/codegen/box/annotations/javaAnnotationCall.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_RUNTIME // WITH_RUNTIME
// MODULE: lib // MODULE: lib
compiler/testData/codegen/box/annotations/javaAnnotationDefault.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_RUNTIME // WITH_RUNTIME
// MODULE: lib // MODULE: lib
compiler/testData/codegen/box/annotations/javaNegativePropertyAsAnnotationParameter.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_RUNTIME // WITH_RUNTIME
// MODULE: lib // MODULE: lib
compiler/testData/codegen/box/annotations/javaPropertyAsAnnotationParameter.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_RUNTIME // WITH_RUNTIME
// MODULE: lib // MODULE: lib
compiler/testData/codegen/box/annotations/javaPropertyWithIntInitializer.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_RUNTIME // WITH_RUNTIME
// MODULE: lib // MODULE: lib
compiler/testData/codegen/box/annotations/kClassMapping/arrayClassParameter.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_RUNTIME // WITH_RUNTIME
// MODULE: lib // MODULE: lib
compiler/testData/codegen/box/annotations/kClassMapping/arrayClassParameterOnJavaClass.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_RUNTIME // WITH_RUNTIME
// MODULE: lib // MODULE: lib
compiler/testData/codegen/box/annotations/kClassMapping/classParameter.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_RUNTIME // WITH_RUNTIME
// MODULE: lib // MODULE: lib
compiler/testData/codegen/box/annotations/kClassMapping/classParameterOnJavaClass.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_RUNTIME // WITH_RUNTIME
// MODULE: lib // MODULE: lib
compiler/testData/codegen/box/annotations/kClassMapping/varargClassParameter.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_RUNTIME // WITH_RUNTIME
// MODULE: lib // MODULE: lib
compiler/testData/codegen/box/annotations/kClassMapping/varargClassParameterOnJavaClass.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_RUNTIME // WITH_RUNTIME
// MODULE: lib // MODULE: lib
compiler/testData/codegen/box/compileKotlinAgainstKotlin/annotationsOnTypeAliases.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_STDLIB // WITH_STDLIB
compiler/testData/codegen/box/compileKotlinAgainstKotlin/delegationAndAnnotations.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_RUNTIME // WITH_RUNTIME
// MODULE: lib // MODULE: lib
compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/IrConstAcceptMultiModule.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// MODULE: lib // MODULE: lib
// WITH_RUNTIME // WITH_RUNTIME
compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
// WITH_STDLIB // WITH_STDLIB
compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlinedConstants.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_STDLIB // WITH_STDLIB
compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmNames.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_STDLIB // WITH_STDLIB
// WITH_REFLECT // WITH_REFLECT
compiler/testData/codegen/box/compileKotlinAgainstKotlin/recursiveGeneric.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_STDLIB // WITH_STDLIB
// FULL_JDK // FULL_JDK
compiler/testData/codegen/box/compileKotlinAgainstKotlin/reflectTopLevelFunctionOtherFile.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_REFLECT // WITH_REFLECT
compiler/testData/codegen/box/compileKotlinAgainstKotlin/suspendFunWithDefaultMangling.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
// WITH_STDLIB // WITH_STDLIB
compiler/testData/codegen/box/compileKotlinAgainstKotlin/suspendFunWithDefaultOldMangling.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// IGNORE_BACKEND_FIR: JVM_IR
// !LANGUAGE: +InlineClasses // !LANGUAGE: +InlineClasses
// WITH_STDLIB // WITH_STDLIB
// MODULE: lib // MODULE: lib
compiler/testData/codegen/box/compileKotlinAgainstKotlin/typeAnnotations/implicitReturn.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// EMIT_JVM_TYPE_ANNOTATIONS // EMIT_JVM_TYPE_ANNOTATIONS
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// JVM_TARGET: 1.8 // JVM_TARGET: 1.8
compiler/testData/codegen/box/coroutines/multiModule/inlineCrossModule.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// IGNORE_BACKEND: NATIVE // IGNORE_BACKEND: NATIVE
// WITH_COROUTINES // WITH_COROUTINES
// WITH_RUNTIME // WITH_RUNTIME
compiler/testData/codegen/box/coroutines/multiModule/inlineFunctionWithOptionalParam.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_COROUTINES // WITH_COROUTINES
// WITH_RUNTIME // WITH_RUNTIME
// MODULE: lib // MODULE: lib
compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModule.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_COROUTINES // WITH_COROUTINES
// WITH_RUNTIME // WITH_RUNTIME
// MODULE: lib(support) // MODULE: lib(support)
compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleOverride.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_COROUTINES // WITH_COROUTINES
// WITH_RUNTIME // WITH_RUNTIME
// MODULE: lib(support) // MODULE: lib(support)
compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithController.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_COROUTINES // WITH_COROUTINES
// WITH_RUNTIME // WITH_RUNTIME
// MODULE: lib(support) // MODULE: lib(support)
compiler/testData/codegen/box/coroutines/multiModule/inlineMultiModuleWithInnerInlining.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// IGNORE_BACKEND: NATIVE // IGNORE_BACKEND: NATIVE
// WITH_COROUTINES // WITH_COROUTINES
// WITH_RUNTIME // WITH_RUNTIME
compiler/testData/codegen/box/coroutines/multiModule/inlineTailCall.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// IGNORE_BACKEND: NATIVE // IGNORE_BACKEND: NATIVE
// WITH_RUNTIME // WITH_RUNTIME
// WITH_COROUTINES // WITH_COROUTINES
compiler/testData/codegen/box/coroutines/multiModule/inlineWithJava.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_COROUTINES // WITH_COROUTINES
// WITH_RUNTIME // WITH_RUNTIME
compiler/testData/codegen/box/coroutines/multiModule/simple.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_RUNTIME // WITH_RUNTIME
// WITH_COROUTINES // WITH_COROUTINES
// MODULE: controller(support) // MODULE: controller(support)
compiler/testData/codegen/box/ir/serializationRegressions/genericProperty.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// DONT_TARGET_EXACT_BACKEND: WASM // DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: PROPERTY_REFERENCES // WASM_MUTE_REASON: PROPERTY_REFERENCES
// IGNORE_BACKEND: NATIVE // IGNORE_BACKEND: NATIVE
compiler/testData/codegen/box/multifileClasses/metadataFlag.kt
Vendored
-3
View File
@@ -1,9 +1,6 @@
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_RUNTIME // WITH_RUNTIME
// FIR reports unresolved reference on `extraInt`.
// IGNORE_BACKEND_FIR: JVM_IR
// MODULE: optimized // MODULE: optimized
// !INHERIT_MULTIFILE_PARTS // !INHERIT_MULTIFILE_PARTS
// FILE: optimized.kt // FILE: optimized.kt
compiler/testData/codegen/box/multiplatform/optionalExpectation.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// IGNORE_BACKEND_FIR: JVM_IR
// !LANGUAGE: +MultiPlatformProjects // !LANGUAGE: +MultiPlatformProjects
// !USE_EXPERIMENTAL: kotlin.ExperimentalMultiplatform // !USE_EXPERIMENTAL: kotlin.ExperimentalMultiplatform
// IGNORE_BACKEND: NATIVE // IGNORE_BACKEND: NATIVE
compiler/testData/codegen/box/properties/genericPropertyMultiModule.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// DONT_TARGET_EXACT_BACKEND: WASM // DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: PROPERTY_REFERENCES // WASM_MUTE_REASON: PROPERTY_REFERENCES
// WITH_RUNTIME // WITH_RUNTIME
compiler/testData/codegen/box/recursiveRawTypes/kt16639.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_RUNTIME // WITH_RUNTIME
// MODULE: lib // MODULE: lib
compiler/testData/codegen/box/reflection/mapping/jClass2kClass.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_RUNTIME // WITH_RUNTIME
// MODULE: lib // MODULE: lib
compiler/testData/codegen/box/reflection/mapping/javaConstructor.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_REFLECT // WITH_REFLECT
// MODULE: lib // MODULE: lib
compiler/testData/codegen/box/reflection/mapping/javaFields.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_REFLECT // WITH_REFLECT
// FULL_JDK // FULL_JDK
compiler/testData/codegen/box/sam/adapters/implementAdapter.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_RUNTIME // WITH_RUNTIME
// MODULE: lib // MODULE: lib
compiler/testData/codegen/box/sam/differentFqNames.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_RUNTIME // WITH_RUNTIME
// MODULE: lib // MODULE: lib
compiler/testData/codegen/box/sam/kt11696.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_RUNTIME // WITH_RUNTIME
// SAM_CONVERSIONS: CLASS // SAM_CONVERSIONS: CLASS
// ^ test checks reflection for synthetic classes // ^ test checks reflection for synthetic classes
compiler/testData/codegen/box/sam/samConstructorGenericSignature.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// SKIP_JDK6 // SKIP_JDK6
// WITH_RUNTIME // WITH_RUNTIME
compiler/testData/codegen/box/throws/delegationAndThrows_AgainstCompiled.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// WITH_RUNTIME // WITH_RUNTIME
// MODULE: lib // MODULE: lib
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirModuleInfoProvider.kt
+2 -1
View File
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.test.frontend.fir
import org.jetbrains.kotlin.fir.java.FirProjectSessionProvider import org.jetbrains.kotlin.fir.java.FirProjectSessionProvider
import org.jetbrains.kotlin.fir.session.FirJvmModuleInfo import org.jetbrains.kotlin.fir.session.FirJvmModuleInfo
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.test.model.DependencyKind
import org.jetbrains.kotlin.test.services.TestService import org.jetbrains.kotlin.test.services.TestService
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.dependencyProvider import org.jetbrains.kotlin.test.services.dependencyProvider
@@ -24,7 +25,7 @@ class FirModuleInfoProvider(
fun convertToFirModuleInfo(module: TestModule): FirJvmModuleInfo { fun convertToFirModuleInfo(module: TestModule): FirJvmModuleInfo {
return firModuleInfoByModule.getOrPut(module) { return firModuleInfoByModule.getOrPut(module) {
val dependencies = mutableListOf(builtinsModuleInfoForModule(module)) val dependencies = mutableListOf(builtinsModuleInfoForModule(module))
module.dependencies.mapTo(dependencies) { module.dependencies.filter { it.kind == DependencyKind.Source }.mapTo(dependencies) {
convertToFirModuleInfo(testServices.dependencyProvider.getTestModule(it.moduleName)) convertToFirModuleInfo(testServices.dependencyProvider.getTestModule(it.moduleName))
} }
FirJvmModuleInfo(Name.identifier(module.name), dependencies) FirJvmModuleInfo(Name.identifier(module.name), dependencies)