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

[Test] Cleanup JvmEnvironmentConfigurator

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-02-09 16:31:54 +03:00
committed by TeamCityServer
parent a932f69b8a
commit 24d6853ead
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt
+5 -10
View File
@@ -25,9 +25,10 @@ import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirective
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.SAM_CONVERSIONS
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.STRING_CONCAT
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.ENABLE_JVM_PREVIEW
import org.jetbrains.kotlin.test.directives.model.DirectivesContainer
import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives
import org.jetbrains.kotlin.test.directives.model.singleOrZeroValue
import org.jetbrains.kotlin.test.model.DependencyDescription
import org.jetbrains.kotlin.test.model.DependencyKind
import org.jetbrains.kotlin.test.model.TestModule
@@ -59,16 +60,14 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig
register(SAM_CONVERSIONS, JVMConfigurationKeys.SAM_CONVERSIONS)
register(LAMBDAS, JVMConfigurationKeys.LAMBDAS)
register(USE_OLD_INLINE_CLASSES_MANGLING_SCHEME, JVMConfigurationKeys.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME)
register(ENABLE_JVM_PREVIEW, JVMConfigurationKeys.ENABLE_JVM_PREVIEW)
}
override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule) {
if (module.targetPlatform !in JvmPlatforms.allJvmPlatforms) return
val registeredDirectives = module.directives
val targets = registeredDirectives[JvmEnvironmentConfigurationDirectives.JVM_TARGET]
when (targets.size) {
0 -> {}
1 -> configuration.put(JVMConfigurationKeys.JVM_TARGET, targets.single())
else -> error("Too many jvm targets passed: ${targets.joinToArrayString()}")
registeredDirectives.singleOrZeroValue(JvmEnvironmentConfigurationDirectives.JVM_TARGET)?.let {
configuration.put(JVMConfigurationKeys.JVM_TARGET, it)
}
configureDefaultJvmTarget(configuration)
@@ -127,10 +126,6 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig
configuration.addJvmClasspathRoot(ForTestCompileRuntime.androidAnnotationsForTests())
}
if (LanguageSettingsDirectives.ENABLE_JVM_PREVIEW in module.directives) {
configuration.put(JVMConfigurationKeys.ENABLE_JVM_PREVIEW, true)
}
val isIr = module.targetBackend?.isIR == true
configuration.put(JVMConfigurationKeys.IR, isIr)