[tests][FIR][checkers][Wasm] Prepare for addition of KMP Wasm test data
This commit is contained in:
committed by
Space Team
parent
a7332a4cad
commit
24d7d8088c
+2
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.platform.jvm.JdkPlatform
|
|||||||
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
|
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
|
||||||
import org.jetbrains.kotlin.platform.konan.NativePlatformUnspecifiedTarget
|
import org.jetbrains.kotlin.platform.konan.NativePlatformUnspecifiedTarget
|
||||||
import org.jetbrains.kotlin.platform.konan.NativePlatforms
|
import org.jetbrains.kotlin.platform.konan.NativePlatforms
|
||||||
|
import org.jetbrains.kotlin.platform.wasm.WasmPlatforms
|
||||||
|
|
||||||
enum class TargetPlatformEnum(val targetPlatform: TargetPlatform) {
|
enum class TargetPlatformEnum(val targetPlatform: TargetPlatform) {
|
||||||
Common(
|
Common(
|
||||||
@@ -31,5 +32,6 @@ enum class TargetPlatformEnum(val targetPlatform: TargetPlatform) {
|
|||||||
JVM_1_8(JvmPlatforms.jvm8),
|
JVM_1_8(JvmPlatforms.jvm8),
|
||||||
|
|
||||||
JS(JsPlatforms.defaultJsPlatform),
|
JS(JsPlatforms.defaultJsPlatform),
|
||||||
|
Wasm(WasmPlatforms.Default),
|
||||||
Native(NativePlatforms.unspecifiedNativePlatform)
|
Native(NativePlatforms.unspecifiedNativePlatform)
|
||||||
}
|
}
|
||||||
|
|||||||
+2
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.platform.js.JsPlatforms
|
|||||||
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
|
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
|
||||||
import org.jetbrains.kotlin.platform.jvm.isJvm
|
import org.jetbrains.kotlin.platform.jvm.isJvm
|
||||||
import org.jetbrains.kotlin.platform.konan.NativePlatforms
|
import org.jetbrains.kotlin.platform.konan.NativePlatforms
|
||||||
|
import org.jetbrains.kotlin.platform.wasm.WasmPlatforms
|
||||||
import org.jetbrains.kotlin.test.Assertions
|
import org.jetbrains.kotlin.test.Assertions
|
||||||
import org.jetbrains.kotlin.test.TargetBackend
|
import org.jetbrains.kotlin.test.TargetBackend
|
||||||
import org.jetbrains.kotlin.test.TestInfrastructureInternals
|
import org.jetbrains.kotlin.test.TestInfrastructureInternals
|
||||||
@@ -376,6 +377,7 @@ class ModuleStructureExtractorImpl(
|
|||||||
nameSuffix == "COMMON" -> CommonPlatforms.defaultCommonPlatform
|
nameSuffix == "COMMON" -> CommonPlatforms.defaultCommonPlatform
|
||||||
nameSuffix == "JVM" -> JvmPlatforms.unspecifiedJvmPlatform // TODO(dsavvinov): determine JvmTarget precisely
|
nameSuffix == "JVM" -> JvmPlatforms.unspecifiedJvmPlatform // TODO(dsavvinov): determine JvmTarget precisely
|
||||||
nameSuffix == "JS" -> JsPlatforms.defaultJsPlatform
|
nameSuffix == "JS" -> JsPlatforms.defaultJsPlatform
|
||||||
|
nameSuffix == "WASM" -> WasmPlatforms.Default
|
||||||
nameSuffix == "NATIVE" -> NativePlatforms.unspecifiedNativePlatform
|
nameSuffix == "NATIVE" -> NativePlatforms.unspecifiedNativePlatform
|
||||||
nameSuffix.isEmpty() -> null // TODO(dsavvinov): this leads to 'null'-platform in ModuleDescriptor
|
nameSuffix.isEmpty() -> null // TODO(dsavvinov): this leads to 'null'-platform in ModuleDescriptor
|
||||||
else -> throw IllegalStateException("Can't determine platform by name $nameSuffix")
|
else -> throw IllegalStateException("Can't determine platform by name $nameSuffix")
|
||||||
|
|||||||
+7
-1
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.test.Constructor
|
|||||||
import org.jetbrains.kotlin.test.FirParser
|
import org.jetbrains.kotlin.test.FirParser
|
||||||
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
|
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
|
||||||
import org.jetbrains.kotlin.test.builders.firHandlersStep
|
import org.jetbrains.kotlin.test.builders.firHandlersStep
|
||||||
|
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives
|
||||||
import org.jetbrains.kotlin.test.directives.configureFirParser
|
import org.jetbrains.kotlin.test.directives.configureFirParser
|
||||||
import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade
|
import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade
|
||||||
import org.jetbrains.kotlin.test.frontend.fir.handlers.*
|
import org.jetbrains.kotlin.test.frontend.fir.handlers.*
|
||||||
@@ -20,7 +21,6 @@ import org.jetbrains.kotlin.test.runners.configurationForClassicAndFirTestsAlong
|
|||||||
import org.jetbrains.kotlin.test.services.AbstractEnvironmentConfigurator
|
import org.jetbrains.kotlin.test.services.AbstractEnvironmentConfigurator
|
||||||
import org.jetbrains.kotlin.test.services.LibraryProvider
|
import org.jetbrains.kotlin.test.services.LibraryProvider
|
||||||
import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator
|
import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator
|
||||||
import org.jetbrains.kotlin.test.services.configuration.WasmEnvironmentConfigurator
|
|
||||||
import org.jetbrains.kotlin.test.services.configuration.WasmEnvironmentConfiguratorJs
|
import org.jetbrains.kotlin.test.services.configuration.WasmEnvironmentConfiguratorJs
|
||||||
import org.jetbrains.kotlin.test.services.configuration.WasmEnvironmentConfiguratorWasi
|
import org.jetbrains.kotlin.test.services.configuration.WasmEnvironmentConfiguratorWasi
|
||||||
import org.jetbrains.kotlin.test.services.sourceProviders.AdditionalDiagnosticsSourceFilesProvider
|
import org.jetbrains.kotlin.test.services.sourceProviders.AdditionalDiagnosticsSourceFilesProvider
|
||||||
@@ -65,6 +65,12 @@ abstract class AbstractFirWasmDiagnosticTestBase(
|
|||||||
::FirScopeDumpHandler,
|
::FirScopeDumpHandler,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
forTestsMatching("compiler/testData/diagnostics/wasmTests/multiplatform/*") {
|
||||||
|
defaultDirectives {
|
||||||
|
LanguageSettingsDirectives.LANGUAGE + "+MultiPlatformProjects"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+7
-2
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
|
|||||||
import org.jetbrains.kotlin.test.builders.classicFrontendHandlersStep
|
import org.jetbrains.kotlin.test.builders.classicFrontendHandlersStep
|
||||||
import org.jetbrains.kotlin.test.builders.classicFrontendStep
|
import org.jetbrains.kotlin.test.builders.classicFrontendStep
|
||||||
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
|
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
|
||||||
|
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives
|
||||||
import org.jetbrains.kotlin.test.frontend.classic.handlers.ClassicDiagnosticsHandler
|
import org.jetbrains.kotlin.test.frontend.classic.handlers.ClassicDiagnosticsHandler
|
||||||
import org.jetbrains.kotlin.test.frontend.classic.handlers.OldNewInferenceMetaInfoProcessor
|
import org.jetbrains.kotlin.test.frontend.classic.handlers.OldNewInferenceMetaInfoProcessor
|
||||||
import org.jetbrains.kotlin.test.model.DependencyKind
|
import org.jetbrains.kotlin.test.model.DependencyKind
|
||||||
@@ -19,7 +20,6 @@ import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerTest
|
|||||||
import org.jetbrains.kotlin.test.services.AbstractEnvironmentConfigurator
|
import org.jetbrains.kotlin.test.services.AbstractEnvironmentConfigurator
|
||||||
import org.jetbrains.kotlin.test.services.LibraryProvider
|
import org.jetbrains.kotlin.test.services.LibraryProvider
|
||||||
import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator
|
import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator
|
||||||
import org.jetbrains.kotlin.test.services.configuration.WasmEnvironmentConfigurator
|
|
||||||
import org.jetbrains.kotlin.test.services.configuration.WasmEnvironmentConfiguratorJs
|
import org.jetbrains.kotlin.test.services.configuration.WasmEnvironmentConfiguratorJs
|
||||||
import org.jetbrains.kotlin.test.services.configuration.WasmEnvironmentConfiguratorWasi
|
import org.jetbrains.kotlin.test.services.configuration.WasmEnvironmentConfiguratorWasi
|
||||||
import org.jetbrains.kotlin.test.services.sourceProviders.AdditionalDiagnosticsSourceFilesProvider
|
import org.jetbrains.kotlin.test.services.sourceProviders.AdditionalDiagnosticsSourceFilesProvider
|
||||||
@@ -59,9 +59,14 @@ abstract class AbstractDiagnosticsWasmTestBase(
|
|||||||
::ClassicDiagnosticsHandler,
|
::ClassicDiagnosticsHandler,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
forTestsMatching("compiler/testData/diagnostics/wasmTests/multiplatform/*") {
|
||||||
|
defaultDirectives {
|
||||||
|
LanguageSettingsDirectives.LANGUAGE + "+MultiPlatformProjects"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
abstract class AbstractDiagnosticsWasmTest : AbstractDiagnosticsWasmTestBase(::WasmEnvironmentConfiguratorJs)
|
abstract class AbstractDiagnosticsWasmTest : AbstractDiagnosticsWasmTestBase(::WasmEnvironmentConfiguratorJs)
|
||||||
abstract class AbstractDiagnosticsWasmWasiTest : AbstractDiagnosticsWasmTestBase(::WasmEnvironmentConfiguratorWasi)
|
abstract class AbstractDiagnosticsWasmWasiTest : AbstractDiagnosticsWasmTestBase(::WasmEnvironmentConfiguratorWasi)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user