From c86a7d4379d74460f804fd011061e3ba20ecb212 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 20 Dec 2024 16:55:54 +0200 Subject: [PATCH] [Test] Don't infer target platform from module name For compiler tests, the target platform is a property of the test itself, not the particular module in the test --- .../services/impl/ModuleStructureExtractorImpl.kt | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/ModuleStructureExtractorImpl.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/ModuleStructureExtractorImpl.kt index 686ea22342574..014c2f9273ad2 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/ModuleStructureExtractorImpl.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/ModuleStructureExtractorImpl.kt @@ -336,7 +336,7 @@ class ModuleStructureExtractorImpl( val moduleName = currentModuleName ?: testServices.defaultDirectives[ModuleStructureDirectives.MODULE].firstOrNull() ?: DEFAULT_MODULE_NAME - val targetPlatform = currentModuleTargetPlatform ?: parseModulePlatformByName(moduleName) ?: defaultsProvider.defaultPlatform + val targetPlatform = currentModuleTargetPlatform ?: defaultsProvider.defaultPlatform val testModule = TestModule( name = moduleName, targetPlatform = targetPlatform, @@ -360,19 +360,6 @@ class ModuleStructureExtractorImpl( resetModuleCaches() } - private fun parseModulePlatformByName(moduleName: String): TargetPlatform? { - val nameSuffix = moduleName.substringAfterLast("-", "").uppercase() - return when { - nameSuffix == "COMMON" -> CommonPlatforms.defaultCommonPlatform - nameSuffix == "JVM" -> JvmPlatforms.unspecifiedJvmPlatform // TODO(dsavvinov): determine JvmTarget precisely - nameSuffix == "JS" -> JsPlatforms.defaultJsPlatform - nameSuffix == "WASM" -> WasmPlatforms.wasmJs - nameSuffix == "NATIVE" -> NativePlatforms.unspecifiedNativePlatform - nameSuffix.isEmpty() -> null // TODO(dsavvinov): this leads to 'null'-platform in ModuleDescriptor - else -> throw IllegalStateException("Can't determine platform by name $nameSuffix") - } - } - private fun finishFile(lineNumber: Int) { val actualDefaultFileName = if (currentModuleName == null) { defaultFileName