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

Remove tests on -Xuse-ir compiler flag

Browse Source 
This flag is going to be removed because old backend is not supported
anymore, therefore there's no need to test it.
This commit is contained in:
Alexander Udalov
2023-05-19 16:54:29 +02:00
committed by Space Team
parent 22096cec3c
commit bb4bb58453
61 changed files with 24 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/jvm-host-test/build.gradle.kts
-7
View File
@@ -43,7 +43,6 @@ tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
projectTest(parallel = true) {
dependsOn(":dist")
workingDir = rootDir
systemProperty("kotlin.script.test.base.compiler.arguments", "-Xuse-old-backend")
}
// This doesn;t work now due to conflicts between embeddable compiler contents and intellij sdk modules
@@ -54,12 +53,6 @@ projectTest(parallel = true) {
// classpath = embeddableTestRuntime
//}
projectTest(taskName = "testWithIr", parallel = true) {
dependsOn(":dist")
workingDir = rootDir
systemProperty("kotlin.script.base.compiler.arguments", "-Xuse-ir")
}
projectTest(taskName = "testWithK2", parallel = true) {
dependsOn(":dist")
workingDir = rootDir
libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ImplicitsFromScriptResultTest.kt
+12 -17
View File
@@ -35,24 +35,19 @@ import kotlin.script.experimental.jvmhost.JvmScriptCompiler
*/
class ImplicitsFromScriptResultTest : TestCase() {
fun testImplicits() {
if (System.getProperty("kotlin.script.base.compiler.arguments")?.let {
!it.contains("-Xuse-ir") || it.contains("-Xuse-old-backend")
} == true
) {
// the implementation of the Compiler Host doesn't work with IR - the inter-script symbol table
// should be maintained to make it run (see latest REPL compiler implementations for details
// TODO: consider either fix it or rewrite to the REPL compiler
val host = CompilerHost()
// the implementation of the Compiler Host doesn't work with IR - the inter-script symbol table
// should be maintained to make it run (see latest REPL compiler implementations for details
// TODO: consider either fix it or rewrite to the REPL compiler
val host = CompilerHost()
val snippets = listOf(
"val xyz0 = 42",
"fun f() = xyz0",
"val finalRes = xyz0 + f()",
)
for (snippet in snippets) {
val res = host.compile(snippet)
assertTrue(res is ResultWithDiagnostics.Success)
}
val snippets = listOf(
"val xyz0 = 42",
"fun f() = xyz0",
"val finalRes = xyz0 + f()",
)
for (snippet in snippets) {
val res = host.compile(snippet)
assertTrue(res is ResultWithDiagnostics.Success)
}
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CompilerOptionsProjectIT.kt
+4 -4
View File
@@ -74,7 +74,7 @@ class CompilerOptionsProjectIT : KGPBaseTest() {
| apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0
| progressiveMode = true
| optIn.add("my.custom.OptInAnnotation")
| freeCompilerArgs.add("-Xuse-ir")
| freeCompilerArgs.add("-Xdebug")
| }
|}
""".trimMargin()
@@ -105,9 +105,9 @@ class CompilerOptionsProjectIT : KGPBaseTest() {
"Compiler arguments does not contain '-opt-in my.custom.OptInAnnotation': $compilationArgs"
}
assert(compilationArgs.contains("-Xuse-ir")) {
assert(compilationArgs.contains("-Xdebug")) {
printBuildOutput()
"Compiler arguments does not contain '-Xuse-ir': $compilationArgs"
"Compiler arguments does not contain '-Xdebug': $compilationArgs"
}
}
}
@@ -132,7 +132,7 @@ class CompilerOptionsProjectIT : KGPBaseTest() {
| apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0
| progressiveMode = true
| optIn.add("my.custom.OptInAnnotation")
| freeCompilerArgs.add("-Xuse-ir")
| freeCompilerArgs.add("-Xdebug")
| }
|
| sourceSets.all {