[Gradle] Disable failed K2 scripting tests
Enable them back when KT-61137 is resolved #KT-60588 In Progress
This commit is contained in:
committed by
Space Team
parent
bdf87c2713
commit
82df028bc5
+13
-2
@@ -9,6 +9,7 @@ import org.gradle.api.logging.LogLevel
|
|||||||
import org.gradle.util.GradleVersion
|
import org.gradle.util.GradleVersion
|
||||||
import org.jetbrains.kotlin.gradle.scripting.internal.ScriptingGradleSubplugin
|
import org.jetbrains.kotlin.gradle.scripting.internal.ScriptingGradleSubplugin
|
||||||
import org.jetbrains.kotlin.gradle.testbase.*
|
import org.jetbrains.kotlin.gradle.testbase.*
|
||||||
|
import org.junit.jupiter.api.Disabled
|
||||||
import org.junit.jupiter.api.DisplayName
|
import org.junit.jupiter.api.DisplayName
|
||||||
import org.junit.jupiter.api.condition.DisabledOnOs
|
import org.junit.jupiter.api.condition.DisabledOnOs
|
||||||
import org.junit.jupiter.api.condition.OS
|
import org.junit.jupiter.api.condition.OS
|
||||||
@@ -25,7 +26,7 @@ abstract class ScriptingIT : KGPBaseTest() {
|
|||||||
|
|
||||||
@DisplayName("basic script is working")
|
@DisplayName("basic script is working")
|
||||||
@GradleTest
|
@GradleTest
|
||||||
fun testScripting(gradleVersion: GradleVersion) {
|
open fun testScripting(gradleVersion: GradleVersion) {
|
||||||
project("scripting", gradleVersion) {
|
project("scripting", gradleVersion) {
|
||||||
val appSubProject = subProject("app")
|
val appSubProject = subProject("app")
|
||||||
val scriptTemplateSubProject = subProject("script-template")
|
val scriptTemplateSubProject = subProject("script-template")
|
||||||
@@ -54,7 +55,7 @@ abstract class ScriptingIT : KGPBaseTest() {
|
|||||||
|
|
||||||
@DisplayName("With custom file extension compiled incremental")
|
@DisplayName("With custom file extension compiled incremental")
|
||||||
@GradleTest
|
@GradleTest
|
||||||
fun testScriptingCustomExtensionIncremental(gradleVersion: GradleVersion) {
|
open fun testScriptingCustomExtensionIncremental(gradleVersion: GradleVersion) {
|
||||||
testScriptingCustomExtensionImpl(gradleVersion, withIC = true)
|
testScriptingCustomExtensionImpl(gradleVersion, withIC = true)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -129,6 +130,16 @@ class ScriptingK1IT : ScriptingIT() {
|
|||||||
class ScriptingK2IT : ScriptingIT() {
|
class ScriptingK2IT : ScriptingIT() {
|
||||||
override val defaultBuildOptions = super.defaultBuildOptions.copyEnsuringK2()
|
override val defaultBuildOptions = super.defaultBuildOptions.copyEnsuringK2()
|
||||||
|
|
||||||
|
@Disabled("KT-61137")
|
||||||
|
override fun testScripting(gradleVersion: GradleVersion) {
|
||||||
|
super.testScripting(gradleVersion)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Disabled("KT-61137")
|
||||||
|
override fun testScriptingCustomExtensionIncremental(gradleVersion: GradleVersion) {
|
||||||
|
super.testScriptingCustomExtensionIncremental(gradleVersion)
|
||||||
|
}
|
||||||
|
|
||||||
override fun GradleProject.disableLightTreeIfNeeded() {
|
override fun GradleProject.disableLightTreeIfNeeded() {
|
||||||
buildGradle.append(
|
buildGradle.append(
|
||||||
"""
|
"""
|
||||||
|
|||||||
Reference in New Issue
Block a user