From 8a0f3c4f1c170cc6f9ead1acac6db3b088e43cc3 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <simon.ogorodnik@jetbrains.com>
Date: Thu, 9 Feb 2023 11:23:10 +0100
Subject: [PATCH] Modularized tests. Remove use of `-Xuse-k2` argument in FP
 test

Use just language version to configure frontend, as -Xuse-k2 flag
is deprecated

^KT-56075
---
 .../jetbrains/kotlin/fir/FE1FullPipelineModularizedTest.kt  | 5 +++++
 .../org/jetbrains/kotlin/fir/FullPipelineModularizedTest.kt | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FE1FullPipelineModularizedTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FE1FullPipelineModularizedTest.kt
index 1a598f6d9f1..cb7105d0ecf 100644
--- a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FE1FullPipelineModularizedTest.kt
+++ b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FE1FullPipelineModularizedTest.kt
@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.fir
 
 import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
+import org.jetbrains.kotlin.config.LanguageVersion
 
 /**
  * Language version to be used for K1 FP tests
@@ -31,6 +32,10 @@ class FE1FullPipelineModularizedTest : AbstractFullPipelineModularizedTest() {
             args.noStdlib = true
             args.noReflect = true
         }
+
+        require(LanguageVersion.fromVersionString(args.languageVersion)!! < LanguageVersion.KOTLIN_2_0) {
+            "Language version misconfiguration for K1 FP: ${args.languageVersion} >= 2.0"
+        }
     }
 
     fun testTotalKotlin() {
diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FullPipelineModularizedTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FullPipelineModularizedTest.kt
index 37ec77efd37..f36e37c4583 100644
--- a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FullPipelineModularizedTest.kt
+++ b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FullPipelineModularizedTest.kt
@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.fir
 
 import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
+import org.jetbrains.kotlin.config.LanguageVersion
 
 // This is used for API version configuration for both frontends
 // TODO: Deprecated and only used in old FP tests
@@ -17,7 +18,6 @@ internal val LANGUAGE_VERSION_K2: String = System.getProperty("fir.bench.languag
 class FullPipelineModularizedTest : AbstractFullPipelineModularizedTest() {
 
     override fun configureArguments(args: K2JVMCompilerArguments, moduleData: ModuleData) {
-        args.useK2 = true
         args.useIR = true
         args.languageVersion = LANGUAGE_VERSION_K2
 
@@ -34,6 +34,10 @@ class FullPipelineModularizedTest : AbstractFullPipelineModularizedTest() {
             args.noStdlib = true
             args.noReflect = true
         }
+
+        require(LanguageVersion.fromVersionString(args.languageVersion)!! >= LanguageVersion.KOTLIN_2_0) {
+            "Language version misconfiguration for K2 FP: ${args.languageVersion} < 2.0"
+        }
     }
 
     fun testTotalKotlin() {