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

[JS Test] Include friend modules in list of all dependencies in compiler configuration

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2023-01-11 14:50:36 +02:00
committed by Space Team
parent 83cbd322fd
commit e88a6af7a0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt
+1 -1
View File
@@ -299,7 +299,7 @@ class ClassicFrontendFacade(
val runtimeKlibs = loadKlib(runtimeKlibsNames, configuration) val runtimeKlibs = loadKlib(runtimeKlibsNames, configuration)
val transitiveLibraries = JsEnvironmentConfigurator.getDependencies(module, testServices, DependencyRelation.RegularDependency) val transitiveLibraries = JsEnvironmentConfigurator.getDependencies(module, testServices, DependencyRelation.RegularDependency)
val friendLibraries = JsEnvironmentConfigurator.getDependencies(module, testServices, DependencyRelation.FriendDependency) val friendLibraries = JsEnvironmentConfigurator.getDependencies(module, testServices, DependencyRelation.FriendDependency)
val allDependencies = runtimeKlibs + dependencyDescriptors + friendsDescriptors + transitiveLibraries val allDependencies = runtimeKlibs + dependencyDescriptors + friendLibraries + friendsDescriptors + transitiveLibraries
val analyzer = AnalyzerWithCompilerReport(configuration) val analyzer = AnalyzerWithCompilerReport(configuration)
val builtInModuleDescriptor = allDependencies.firstNotNullOfOrNull { it.builtIns }?.builtInsModule val builtInModuleDescriptor = allDependencies.firstNotNullOfOrNull { it.builtIns }?.builtInsModule
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt
+2 -2
View File
@@ -264,8 +264,8 @@ class JsEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfigu
val libraries = when (module.targetBackend) { val libraries = when (module.targetBackend) {
null -> JsConfig.JS_STDLIB + JsConfig.JS_KOTLIN_TEST null -> JsConfig.JS_STDLIB + JsConfig.JS_KOTLIN_TEST
TargetBackend.JS_IR -> dependencies TargetBackend.JS_IR -> dependencies + friends
TargetBackend.JS -> JsConfig.JS_STDLIB + JsConfig.JS_KOTLIN_TEST + dependencies TargetBackend.JS -> JsConfig.JS_STDLIB + JsConfig.JS_KOTLIN_TEST + dependencies + friends
else -> error("Unsupported target backend: ${module.targetBackend}") else -> error("Unsupported target backend: ${module.targetBackend}")
} }
configuration.put(JSConfigurationKeys.LIBRARIES, libraries) configuration.put(JSConfigurationKeys.LIBRARIES, libraries)