From f226d855e179cebcf966817ee72d692d0c59e3e3 Mon Sep 17 00:00:00 2001 From: "simon.ogorodnik" Date: Fri, 13 Mar 2020 18:36:37 +0300 Subject: [PATCH] Fix NI flag in modularized test for old frontend --- .../NonFirResolveModularizedTotalKotlinTest.kt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) 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 1d548aa48f1..91f6b9c01be 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 @@ -69,14 +69,15 @@ class NonFirResolveModularizedTotalKotlinTest : AbstractModularizedTest() { val configuration = createDefaultConfiguration(moduleData) - if (USE_NI) { - configuration.languageVersionSettings = - LanguageVersionSettingsImpl( - LanguageVersion.KOTLIN_1_4, ApiVersion.KOTLIN_1_3, specificFeatures = mapOf( - LanguageFeature.NewInference to LanguageFeature.State.ENABLED - ) + + configuration.languageVersionSettings = + LanguageVersionSettingsImpl( + configuration.languageVersionSettings.languageVersion, + configuration.languageVersionSettings.apiVersion, + specificFeatures = mapOf( + LanguageFeature.NewInference to if (USE_NI) LanguageFeature.State.ENABLED else LanguageFeature.State.DISABLED ) - } + ) System.getProperty("fir.bench.oldfe.jvm_target")?.let { configuration.put(JVMConfigurationKeys.JVM_TARGET, JvmTarget.fromString(it) ?: error("Unknown JvmTarget"))