From 02fb11a2cd5e1e15c6967e29add5a6b63bb925a7 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 22 Dec 2020 11:41:51 +0300 Subject: [PATCH] [Test] Fix double reading of module directives --- .../jetbrains/kotlin/test/services/EnvironmentConfigurator.kt | 3 --- .../test/services/configuration/JvmEnvironmentConfigurator.kt | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/EnvironmentConfigurator.kt b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/EnvironmentConfigurator.kt index ec4c8b7c5e0..da93b8e7e19 100644 --- a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/EnvironmentConfigurator.kt +++ b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/EnvironmentConfigurator.kt @@ -22,8 +22,5 @@ abstract class EnvironmentConfigurator(protected val testServices: TestServices) protected val moduleStructure: TestModuleStructure get() = testServices.moduleStructure - protected val TestModule.allRegisteredDirectives: RegisteredDirectives - get() = ComposedRegisteredDirectives(directives, testServices.defaultDirectives) - open fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule, project: MockProject) {} } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt index 8fa8ed5af84..bc7c0e36656 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt @@ -38,7 +38,7 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule, project: MockProject) { if (module.targetPlatform !in JvmPlatforms.allJvmPlatforms) return - val registeredDirectives = module.allRegisteredDirectives + val registeredDirectives = module.directives val targets = registeredDirectives[JvmEnvironmentConfigurationDirectives.JVM_TARGET] when (targets.size) { 0 -> {}