From c4da53475e7a209b25c3a6c65d5f0839befaf70e Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Fri, 15 Sep 2023 19:52:22 +0200 Subject: [PATCH] [JS][tests] Drop obsolete EXPECT_ACTUAL_LINKER test directive This directive was earlier used in KMP tests that were rewritten and do not require this directive anymore. ^KT-61136 --- .../test/directives/JsEnvironmentConfigurationDirectives.kt | 5 ----- .../test/services/configuration/JsEnvironmentConfigurator.kt | 3 --- .../services/configuration/WasmEnvironmentConfigurator.kt | 3 --- 3 files changed, 11 deletions(-) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/JsEnvironmentConfigurationDirectives.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/JsEnvironmentConfigurationDirectives.kt index 7a91314d551..041355b3ef8 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/JsEnvironmentConfigurationDirectives.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/JsEnvironmentConfigurationDirectives.kt @@ -81,11 +81,6 @@ object JsEnvironmentConfigurationDirectives : SimpleDirectivesContainer() { applicability = DirectiveApplicability.Global ) - val EXPECT_ACTUAL_LINKER by directive( - description = "", - applicability = DirectiveApplicability.Global - ) - val SPLIT_PER_MODULE by directive( description = "", applicability = DirectiveApplicability.Global diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt index cf2c7ac822e..9f881f5c767 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt @@ -28,7 +28,6 @@ import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.test.directives.ConfigurationDirectives import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives.ERROR_POLICY -import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives.EXPECT_ACTUAL_LINKER import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives.GENERATE_INLINE_ANONYMOUS_FUNCTIONS import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives.MODULE_KIND import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives.NO_INLINE @@ -295,8 +294,6 @@ class JsEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfigu JSConfigurationKeys.FILE_PATHS_PREFIX_MAP, mapOf(File(".").absolutePath.removeSuffix(".") to "") ) - - configuration.put(CommonConfigurationKeys.EXPECT_ACTUAL_LINKER, EXPECT_ACTUAL_LINKER in registeredDirectives) } } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/WasmEnvironmentConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/WasmEnvironmentConfigurator.kt index 1068a7751d3..069682f15ed 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/WasmEnvironmentConfigurator.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/WasmEnvironmentConfigurator.kt @@ -18,7 +18,6 @@ import org.jetbrains.kotlin.js.config.WasmTarget import org.jetbrains.kotlin.library.KotlinLibrary import org.jetbrains.kotlin.serialization.js.ModuleKind import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives.INFER_MAIN_MODULE -import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives.EXPECT_ACTUAL_LINKER import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives.PROPERTY_LAZY_INITIALIZATION import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives.SOURCE_MAP_EMBED_SOURCES import org.jetbrains.kotlin.test.directives.WasmEnvironmentConfigurationDirectives @@ -175,8 +174,6 @@ abstract class WasmEnvironmentConfigurator(testServices: TestServices) : Environ val sourceMapSourceEmbedding = registeredDirectives[SOURCE_MAP_EMBED_SOURCES].singleOrNull() ?: SourceMapSourceEmbedding.NEVER configuration.put(JSConfigurationKeys.SOURCE_MAP_EMBED_SOURCES, sourceMapSourceEmbedding) - configuration.put(CommonConfigurationKeys.EXPECT_ACTUAL_LINKER, EXPECT_ACTUAL_LINKER in registeredDirectives) - configuration.put(JSConfigurationKeys.WASM_USE_TRAPS_INSTEAD_OF_EXCEPTIONS, DISABLE_WASM_EXCEPTION_HANDLING in registeredDirectives) configuration.put(JSConfigurationKeys.WASM_TARGET, WasmTarget.JS)