From df3fbaf4173acba9772cb59817ecf283f65be9fb Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Wed, 4 Sep 2019 17:35:36 +0300 Subject: [PATCH] Add various configuration parameters to Non Fir modularized tests --- .../NonFirResolveModularizedTotalKotlinTest.kt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/NonFirResolveModularizedTotalKotlinTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/NonFirResolveModularizedTotalKotlinTest.kt index 89b22eea5df..7f09851e6c2 100644 --- a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/NonFirResolveModularizedTotalKotlinTest.kt +++ b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/NonFirResolveModularizedTotalKotlinTest.kt @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler +import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.fir.scopes.ProcessorAction import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.KotlinTestUtils @@ -54,6 +55,21 @@ class NonFirResolveModularizedTotalKotlinTest : AbstractModularizedTest() { configuration.addAll( CONTENT_ROOTS, moduleData.sources.filter { it.extension == "kt" }.map { KotlinSourceRoot(it.absolutePath, false) }) + + if (System.getProperty("fir.bench.oldfe.ni", "true") == "true") { + configuration.languageVersionSettings = + LanguageVersionSettingsImpl( + LanguageVersion.KOTLIN_1_4, ApiVersion.KOTLIN_1_3, specificFeatures = mapOf( + LanguageFeature.NewInference to LanguageFeature.State.ENABLED + ) + ) + } + + configuration.put(JVMConfigurationKeys.USE_FAST_CLASS_FILES_READING, true) + + System.getProperty("fir.bench.oldfe.jvm_target")?.let { + configuration.put(JVMConfigurationKeys.JVM_TARGET, JvmTarget.fromString(it) ?: error("Unknown JvmTarget")) + } configuration.put(MESSAGE_COLLECTOR_KEY, object : MessageCollector { override fun clear() {