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

[Gradle] Disable LightTree for K2 scripting tests

Browse Source 
#KT-60588 In Progress
This commit is contained in:
Alexander.Likhachev
2023-08-18 16:28:10 +02:00
committed by Space Team
parent 196fb3e5f1
commit 3177df9ad8
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ScriptingIT.kt
+24 -4
View File
@@ -27,16 +27,20 @@ abstract class ScriptingIT : KGPBaseTest() {
@GradleTest @GradleTest
fun testScripting(gradleVersion: GradleVersion) { fun testScripting(gradleVersion: GradleVersion) {
project("scripting", gradleVersion) { project("scripting", gradleVersion) {
val appSubProject = subProject("app")
val scriptTemplateSubProject = subProject("script-template")
appSubProject.disableLightTreeIfNeeded()
scriptTemplateSubProject.disableLightTreeIfNeeded()
build("assemble", buildOptions = defaultBuildOptions.copy(logLevel = LogLevel.DEBUG)) { build("assemble", buildOptions = defaultBuildOptions.copy(logLevel = LogLevel.DEBUG)) {
assertCompiledKotlinSources( assertCompiledKotlinSources(
listOf( listOf(
subProject("app").kotlinSourcesDir().resolve("world.greet.kts").relativeTo(projectPath), appSubProject.kotlinSourcesDir().resolve("world.greet.kts").relativeTo(projectPath),
subProject("script-template").kotlinSourcesDir().resolve("GreetScriptTemplate.kt").relativeTo(projectPath) scriptTemplateSubProject.kotlinSourcesDir().resolve("GreetScriptTemplate.kt").relativeTo(projectPath)
), ),
output output
) )
assertFileExists( assertFileExists(
subProject("app").kotlinClassesDir().resolve("World_greet.class") appSubProject.kotlinClassesDir().resolve("World_greet.class")
) )
} }
} }
@@ -56,7 +60,7 @@ abstract class ScriptingIT : KGPBaseTest() {
private fun testScriptingCustomExtensionImpl( private fun testScriptingCustomExtensionImpl(
gradleVersion: GradleVersion, gradleVersion: GradleVersion,
withIC: Boolean withIC: Boolean,
) { ) {
project( project(
"scriptingCustomExtension", "scriptingCustomExtension",
@@ -67,6 +71,7 @@ abstract class ScriptingIT : KGPBaseTest() {
) )
) { ) {
val appSubproject = subProject("app") val appSubproject = subProject("app")
appSubproject.disableLightTreeIfNeeded()
val bobGreetSource = appSubproject.kotlinSourcesDir().resolve("bob.greet") val bobGreetSource = appSubproject.kotlinSourcesDir().resolve("bob.greet")
val bobGreet = bobGreetSource.relativeTo(projectPath) val bobGreet = bobGreetSource.relativeTo(projectPath)
val aliceGreet = appSubproject.kotlinSourcesDir().resolve("alice.greet").relativeTo(projectPath) val aliceGreet = appSubproject.kotlinSourcesDir().resolve("alice.greet").relativeTo(projectPath)
@@ -110,6 +115,9 @@ abstract class ScriptingIT : KGPBaseTest() {
} }
} }
open fun GradleProject.disableLightTreeIfNeeded() {
}
} }
@DisplayName("K1 Scripting plugin") @DisplayName("K1 Scripting plugin")
@@ -120,4 +128,16 @@ class ScriptingK1IT : ScriptingIT() {
@DisplayName("K2 Scripting plugin") @DisplayName("K2 Scripting plugin")
class ScriptingK2IT : ScriptingIT() { class ScriptingK2IT : ScriptingIT() {
override val defaultBuildOptions = super.defaultBuildOptions.copyEnsuringK2() override val defaultBuildOptions = super.defaultBuildOptions.copyEnsuringK2()
override fun GradleProject.disableLightTreeIfNeeded() {
buildGradle.append(
"""
tasks.named("compileKotlin", org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configure {
compilerOptions {
freeCompilerArgs.add("-Xuse-fir-lt=false") // Scripts are not yet supported with K2 in LightTree mode
}
}
""".trimIndent()
)
}
} }