Give slightly better names to language/API version variables in FP tests

This commit is contained in:
Mikhail Glukhikh
2023-01-09 16:00:12 +01:00
parent 70fc891260
commit a13fd033fc
2 changed files with 9 additions and 4 deletions
@@ -11,7 +11,7 @@ class FE1FullPipelineModularizedTest : AbstractFullPipelineModularizedTest() {
override fun configureArguments(args: K2JVMCompilerArguments, moduleData: ModuleData) {
args.useK2 = false
args.jvmDefault = "compatibility"
args.apiVersion = LANGUAGE_VERSION
args.apiVersion = API_VERSION
args.optIn = arrayOf(
"kotlin.RequiresOptIn",
"kotlin.contracts.ExperimentalContracts",
@@ -7,15 +7,20 @@ package org.jetbrains.kotlin.fir
import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
internal val LANGUAGE_VERSION: String = System.getProperty("fir.bench.language.version", "1.4")
// This is used for API version configuration for both frontends
// TODO: rename system property
internal val API_VERSION: String = System.getProperty("fir.bench.language.version", "1.4")
// This is used for language version configuration for K2 only. K1 always uses default version
private val LANGUAGE_VERSION_K2: String = System.getProperty("fir.bench.language.version.k2", "2.0")
class FullPipelineModularizedTest : AbstractFullPipelineModularizedTest() {
override fun configureArguments(args: K2JVMCompilerArguments, moduleData: ModuleData) {
args.useK2 = true
args.useIR = true
args.languageVersion = "2.0"
args.apiVersion = LANGUAGE_VERSION
args.languageVersion = LANGUAGE_VERSION_K2
args.apiVersion = API_VERSION
args.jvmDefault = "compatibility"
args.optIn = moduleData.optInAnnotations.toTypedArray() + arrayOf(
"kotlin.RequiresOptIn",