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

[Test] Fix double reading of module directives

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-12-22 11:41:51 +03:00
committed by TeamCityServer
parent 0e3ed3fee6
commit 02fb11a2cd
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/EnvironmentConfigurator.kt
-3
View File
@@ -22,8 +22,5 @@ abstract class EnvironmentConfigurator(protected val testServices: TestServices)
protected val moduleStructure: TestModuleStructure protected val moduleStructure: TestModuleStructure
get() = testServices.moduleStructure get() = testServices.moduleStructure
protected val TestModule.allRegisteredDirectives: RegisteredDirectives
get() = ComposedRegisteredDirectives(directives, testServices.defaultDirectives)
open fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule, project: MockProject) {} open fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule, project: MockProject) {}
} }
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt
+1 -1
View File
@@ -38,7 +38,7 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig
override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule, project: MockProject) { override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule, project: MockProject) {
if (module.targetPlatform !in JvmPlatforms.allJvmPlatforms) return if (module.targetPlatform !in JvmPlatforms.allJvmPlatforms) return
val registeredDirectives = module.allRegisteredDirectives val registeredDirectives = module.directives
val targets = registeredDirectives[JvmEnvironmentConfigurationDirectives.JVM_TARGET] val targets = registeredDirectives[JvmEnvironmentConfigurationDirectives.JVM_TARGET]
when (targets.size) { when (targets.size) {
0 -> {} 0 -> {}