[Gradle] Remove default build options duplicates in ConfigurationCacheIT

This commit is contained in:
Alexander Likhachev
2023-01-03 19:11:30 +01:00
committed by Space Team
parent bfde8eda81
commit 487439054e
@@ -6,7 +6,6 @@
package org.jetbrains.kotlin.gradle package org.jetbrains.kotlin.gradle
import org.gradle.api.logging.LogLevel import org.gradle.api.logging.LogLevel
import org.gradle.api.logging.configuration.WarningMode
import org.gradle.util.GradleVersion import org.gradle.util.GradleVersion
import org.jetbrains.kotlin.gradle.report.BuildReportType import org.jetbrains.kotlin.gradle.report.BuildReportType
import org.jetbrains.kotlin.gradle.testbase.* import org.jetbrains.kotlin.gradle.testbase.*
@@ -110,8 +109,6 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
"build", "build",
executedTaskNames = expectedTasks, executedTaskNames = expectedTasks,
buildOptions = defaultBuildOptions.copy( buildOptions = defaultBuildOptions.copy(
configurationCacheProblems = BaseGradleIT.ConfigurationCacheProblems.FAIL,
warningMode = WarningMode.All,
freeArgs = listOf( freeArgs = listOf(
// remove after KT-49933 is fixed // remove after KT-49933 is fixed
"-x", ":lib:transformCommonMainDependenciesMetadata", "-x", ":lib:transformCommonMainDependenciesMetadata",
@@ -128,14 +125,9 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
@GradleTest @GradleTest
fun testCommonizer(gradleVersion: GradleVersion) { fun testCommonizer(gradleVersion: GradleVersion) {
project("native-configuration-cache", gradleVersion) { project("native-configuration-cache", gradleVersion) {
val buildOptions = defaultBuildOptions.copy(
configurationCacheProblems = BaseGradleIT.ConfigurationCacheProblems.FAIL,
warningMode = WarningMode.All
)
build( build(
":lib:commonizeCInterop", ":lib:commonizeCInterop",
":commonizeNativeDistribution", ":commonizeNativeDistribution",
buildOptions = buildOptions
) { ) {
// Reduce the problem numbers when a Task become compatible with GCC. // Reduce the problem numbers when a Task become compatible with GCC.
// When all tasks support GCC, replace these assertions with `testConfigurationCacheOf` // When all tasks support GCC, replace these assertions with `testConfigurationCacheOf`