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

Handle LV 2.0 in modularized tests

Browse Source
This commit is contained in:
Mikhail Glukhikh
2022-12-05 10:20:05 +01:00
parent 17c434002a
commit f332b6dcec
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FE1FullPipelineModularizedTest.kt
+1 -1
View File
@@ -11,7 +11,7 @@ class FE1FullPipelineModularizedTest : AbstractFullPipelineModularizedTest() {
override fun configureArguments(args: K2JVMCompilerArguments, moduleData: ModuleData) { override fun configureArguments(args: K2JVMCompilerArguments, moduleData: ModuleData) {
args.useK2 = false args.useK2 = false
args.jvmDefault = "compatibility" args.jvmDefault = "compatibility"
args.apiVersion = "1.4" args.apiVersion = LANGUAGE_VERSION
args.optIn = arrayOf( args.optIn = arrayOf(
"kotlin.RequiresOptIn", "kotlin.RequiresOptIn",
"kotlin.contracts.ExperimentalContracts", "kotlin.contracts.ExperimentalContracts",
compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FullPipelineModularizedTest.kt
+2 -1
View File
@@ -7,13 +7,14 @@ package org.jetbrains.kotlin.fir
import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
private val LANGUAGE_VERSION: String = System.getProperty("fir.bench.language.version", "1.4") internal val LANGUAGE_VERSION: String = System.getProperty("fir.bench.language.version", "1.4")
class FullPipelineModularizedTest : AbstractFullPipelineModularizedTest() { class FullPipelineModularizedTest : AbstractFullPipelineModularizedTest() {
override fun configureArguments(args: K2JVMCompilerArguments, moduleData: ModuleData) { override fun configureArguments(args: K2JVMCompilerArguments, moduleData: ModuleData) {
args.useK2 = true args.useK2 = true
args.useIR = true args.useIR = true
args.languageVersion = "2.0"
args.apiVersion = LANGUAGE_VERSION args.apiVersion = LANGUAGE_VERSION
args.jvmDefault = "compatibility" args.jvmDefault = "compatibility"
args.optIn = moduleData.optInAnnotations.toTypedArray() + arrayOf( args.optIn = moduleData.optInAnnotations.toTypedArray() + arrayOf(