From 72a6f977f614b308f70908075a23ac3b963b9e6d Mon Sep 17 00:00:00 2001 From: Alexander Likhachev Date: Tue, 3 Jan 2023 18:51:33 +0100 Subject: [PATCH] [Gradle] Disable fail on warning for some tests because of KT-55751 #KT-52625 In Progress --- .../kotlin/gradle/BuildIdeaKpmProjectModelIT.kt | 8 +++++++- .../kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt | 9 ++++++++- .../jetbrains/kotlin/gradle/KpmCompilerPluginMppIT.kt | 5 +++++ .../kotlin/gradle/VariantAwareDependenciesMppIT.kt | 8 +++++++- 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildIdeaKpmProjectModelIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildIdeaKpmProjectModelIT.kt index 7e9230a9032..19148bb2bc0 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildIdeaKpmProjectModelIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildIdeaKpmProjectModelIT.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.gradle +import org.gradle.api.logging.configuration.WarningMode import org.gradle.util.GradleVersion import org.jetbrains.kotlin.gradle.testbase.* import org.junit.jupiter.api.DisplayName @@ -16,7 +17,12 @@ class BuildIdeaKpmProjectModelIT : KGPBaseTest() { @GradleTest @DisplayName("Check 'buildIdeaKpmProjectModel' creates expected files") fun `test - simple kpm project`(gradleVersion: GradleVersion) { - project("kpm-simple", gradleVersion) { + project( + "kpm-simple", gradleVersion, buildOptions = defaultBuildOptions.copy( + // Workaround for KT-55751 + warningMode = WarningMode.None, + ) + ) { build("buildIdeaKpmProjectModel") { assertFileInProjectExists("build/IdeaKpmProject/model.txt") assertFileInProjectExists("build/IdeaKpmProject/model.java.bin") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt index 83c05e1809e..46461f42880 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle import groovy.json.StringEscapeUtils import org.gradle.api.logging.LogLevel.INFO +import org.gradle.api.logging.configuration.WarningMode import org.gradle.internal.os.OperatingSystem import org.jetbrains.kotlin.commonizer.CommonizerTarget import org.jetbrains.kotlin.gradle.util.reportSourceSetCommonizerDependencies @@ -430,7 +431,13 @@ class CommonizerIT : BaseGradleIT() { @Test fun `test KT-49735 two kotlin targets with same konanTarget`() { with(Project("commonize-kt-49735-twoKotlinTargets-oneKonanTarget")) { - build(":assemble") { + build( + ":assemble", + options = defaultBuildOptions().copy( + // Workaround for KT-55751 + warningMode = WarningMode.None, + ) + ) { assertTasksExecuted(":compileCommonMainKotlinMetadata") assertSuccessful() } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KpmCompilerPluginMppIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KpmCompilerPluginMppIT.kt index c448d02b415..d7daa1e50bc 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KpmCompilerPluginMppIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KpmCompilerPluginMppIT.kt @@ -5,10 +5,15 @@ package org.jetbrains.kotlin.gradle +import org.gradle.api.logging.configuration.WarningMode import org.junit.Test import kotlin.test.assertTrue class KpmCompilerPluginMppIT : BaseGradleIT() { + override fun defaultBuildOptions() = super.defaultBuildOptions().copy( + // Workaround for KT-55751 + warningMode = WarningMode.None, + ) @Test fun testTransientPluginOptions() { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesMppIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesMppIT.kt index 69b513c0a52..f451bd72b55 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesMppIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesMppIT.kt @@ -359,7 +359,13 @@ class VariantAwareDependenciesMppIT : BaseGradleIT() { """ ) - build(resolveConfigurationTaskName) { + build( + resolveConfigurationTaskName, + options = defaultBuildOptions().copy( + // Workaround for KT-55751 + warningMode = WarningMode.None, + ) + ) { assertSuccessful() val output = output.lines().single { marker in it }.substringAfter(marker).removeSurrounding("[", "]").split(",") assertTrue { output.any { "$nestedProjectName-1.0.jar" in it } }