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

Run K1 configuration on TC with languageVersion="1.9"

Browse Source 
KotlinVersion is overrided on TC, so we need to rely on LanguageVersion

#KT-60589 Fixed
This commit is contained in:
Aleksei.Cherepanov
2023-07-25 17:59:47 +02:00
committed by Space Team
parent 6089d3efc5
commit f6963d04e9
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalK1JvmJpsTest.kt
+2 -1
View File
@@ -6,12 +6,13 @@
package org.jetbrains.kotlin.jps.build
import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
import org.jetbrains.kotlin.config.LanguageVersion
abstract class AbstractIncrementalK1JvmJpsTest(
allowNoFilesWithSuffixInTestData: Boolean = false
) : AbstractIncrementalJvmJpsTest(allowNoFilesWithSuffixInTestData = allowNoFilesWithSuffixInTestData) {
override fun updateCommandLineArguments(arguments: CommonCompilerArguments) {
if (KotlinVersion.CURRENT.major >= 2) {
if (LanguageVersion.LATEST_STABLE.major >= 2) {
arguments.languageVersion = "1.9"
}
super.updateCommandLineArguments(arguments)
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalK2FirICLightTreeJvmJpsTest.kt
+2 -1
View File
@@ -6,13 +6,14 @@
package org.jetbrains.kotlin.jps.build
import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
import org.jetbrains.kotlin.config.LanguageVersion
import org.jetbrains.kotlin.incremental.testingUtils.BuildLogFinder
abstract class AbstractIncrementalK2FirICLightTreeJvmJpsTest(
allowNoFilesWithSuffixInTestData: Boolean = false
) : AbstractIncrementalJpsTest(allowNoFilesWithSuffixInTestData = allowNoFilesWithSuffixInTestData) {
override fun updateCommandLineArguments(arguments: CommonCompilerArguments) {
if (KotlinVersion.CURRENT.major < 2) {
if (LanguageVersion.LATEST_STABLE.major < 2) {
arguments.languageVersion = "2.0"
}
additionalCommandLineArguments = additionalCommandLineArguments + listOf("-Xuse-fir-ic", "-Xuse-fir-lt")
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalK2JvmJpsTest.kt
+2 -1
View File
@@ -6,13 +6,14 @@
package org.jetbrains.kotlin.jps.build
import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
import org.jetbrains.kotlin.config.LanguageVersion
import org.jetbrains.kotlin.incremental.testingUtils.BuildLogFinder
abstract class AbstractIncrementalK2JvmJpsTest(
allowNoFilesWithSuffixInTestData: Boolean = false
) : AbstractIncrementalJpsTest(allowNoFilesWithSuffixInTestData = allowNoFilesWithSuffixInTestData) {
override fun updateCommandLineArguments(arguments: CommonCompilerArguments) {
if (KotlinVersion.CURRENT.major < 2) {
if (LanguageVersion.LATEST_STABLE.major < 2) {
arguments.languageVersion = "2.0"
}
additionalCommandLineArguments = additionalCommandLineArguments + listOf("-Xuse-fir-lt=false")
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalK2LightTreeJvmJpsTest.kt
+2 -1
View File
@@ -6,13 +6,14 @@
package org.jetbrains.kotlin.jps.build
import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
import org.jetbrains.kotlin.config.LanguageVersion
import org.jetbrains.kotlin.incremental.testingUtils.BuildLogFinder
abstract class AbstractIncrementalK2LightTreeJvmJpsTest(
allowNoFilesWithSuffixInTestData: Boolean = false
) : AbstractIncrementalJpsTest(allowNoFilesWithSuffixInTestData = allowNoFilesWithSuffixInTestData) {
override fun updateCommandLineArguments(arguments: CommonCompilerArguments) {
if (KotlinVersion.CURRENT.major < 2) {
if (LanguageVersion.LATEST_STABLE.major < 2) {
arguments.languageVersion = "2.0"
}
additionalCommandLineArguments = additionalCommandLineArguments + listOf("-Xuse-fir-lt=true")
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/TestProcessSettings.kt
+2 -4
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.konan.blackboxtest.support.settings
import org.jetbrains.kotlin.config.LanguageVersion
import org.jetbrains.kotlin.konan.blackboxtest.support.MutedOption
import org.jetbrains.kotlin.konan.blackboxtest.support.TestKind
import org.jetbrains.kotlin.konan.blackboxtest.support.runner.LocalTestRunner
@@ -259,9 +260,6 @@ internal sealed class CacheMode {
}
}
private fun KotlinVersion.toCanonicalString(): String =
"$major.$minor"
internal enum class PipelineType(val mutedOption: MutedOption, val compilerFlags: List<String>) {
K1(
MutedOption.K1,
@@ -269,7 +267,7 @@ internal enum class PipelineType(val mutedOption: MutedOption, val compilerFlags
),
K2(
MutedOption.K2,
listOf("-language-version", if (KotlinVersion.CURRENT.major < 2) "2.0" else KotlinVersion.CURRENT.toCanonicalString())
listOf("-language-version", if (LanguageVersion.LATEST_STABLE.major < 2) "2.0" else LanguageVersion.LATEST_STABLE.toString())
);
override fun toString() = if (compilerFlags.isEmpty()) "" else compilerFlags.joinToString(prefix = "(", postfix = ")", separator = " ")