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 b27bb5316bd..7cc53b61e71 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 @@ -16,27 +16,31 @@ import kotlin.test.fail class CommonizerIT : BaseGradleIT() { override val defaultGradleVersion: GradleVersionRequired = GradleVersionRequired.FOR_MPP_SUPPORT + companion object { + private const val commonizerOutput = "Preparing commonized Kotlin/Native libraries" + } + @Test fun `test commonizeNativeDistributionWithIosLinuxWindows`() { with(Project("commonizeNativeDistributionWithIosLinuxWindows")) { build(":p1:commonize", "-Pkotlin.mpp.enableNativeDistributionCommonizationCache=false") { assertTasksExecuted(":p1:commonizeNativeDistribution") assertContains(DISABLED_NATIVE_TARGETS_REPORTER_WARNING_PREFIX) - assertContains("Kotlin KLIB commonizer:") + assertContains(commonizerOutput) assertSuccessful() } build(":p1:commonize", "--rerun-tasks", "-Pkotlin.mpp.enableNativeDistributionCommonizationCache=true") { assertTasksExecuted(":p1:commonizeNativeDistribution") assertContains("Native Distribution Commonization: Cache hit") - assertNotContains("Kotlin KLIB commonizer:") + assertNotContains(commonizerOutput) assertSuccessful() } build(":p1:commonize", "--rerun-tasks", "-Pkotlin.mpp.enableNativeDistributionCommonizationCache=false") { assertTasksExecuted(":p1:commonizeNativeDistribution") assertContains("Native Distribution Commonization: Cache disabled") - assertContains("Kotlin KLIB commonizer:") + assertContains(commonizerOutput) assertSuccessful() } } diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/Task.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/Task.kt index ceb43e5b894..9f1f051984a 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/Task.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/Task.kt @@ -16,7 +16,7 @@ internal abstract class Task(private val options: Collection>) : Compa // Important: the order of entries affects that order of tasks execution INFORMATIONAL, COMMONIZATION( - prologue = "\nKotlin KLIB commonizer: Please wait while preparing libraries.", + prologue = null, epilogue = "\n", logEachStep = true )