[Commonizer] Logging: Remove 'COMMONIZATION' prologue

^KT-36679
This commit is contained in:
sebastian.sellmair
2021-04-29 09:48:12 +02:00
committed by TeamCityServer
parent 9d9e11d6d8
commit ec440aecf6
2 changed files with 8 additions and 4 deletions
@@ -16,27 +16,31 @@ import kotlin.test.fail
class CommonizerIT : BaseGradleIT() { class CommonizerIT : BaseGradleIT() {
override val defaultGradleVersion: GradleVersionRequired = GradleVersionRequired.FOR_MPP_SUPPORT override val defaultGradleVersion: GradleVersionRequired = GradleVersionRequired.FOR_MPP_SUPPORT
companion object {
private const val commonizerOutput = "Preparing commonized Kotlin/Native libraries"
}
@Test @Test
fun `test commonizeNativeDistributionWithIosLinuxWindows`() { fun `test commonizeNativeDistributionWithIosLinuxWindows`() {
with(Project("commonizeNativeDistributionWithIosLinuxWindows")) { with(Project("commonizeNativeDistributionWithIosLinuxWindows")) {
build(":p1:commonize", "-Pkotlin.mpp.enableNativeDistributionCommonizationCache=false") { build(":p1:commonize", "-Pkotlin.mpp.enableNativeDistributionCommonizationCache=false") {
assertTasksExecuted(":p1:commonizeNativeDistribution") assertTasksExecuted(":p1:commonizeNativeDistribution")
assertContains(DISABLED_NATIVE_TARGETS_REPORTER_WARNING_PREFIX) assertContains(DISABLED_NATIVE_TARGETS_REPORTER_WARNING_PREFIX)
assertContains("Kotlin KLIB commonizer:") assertContains(commonizerOutput)
assertSuccessful() assertSuccessful()
} }
build(":p1:commonize", "--rerun-tasks", "-Pkotlin.mpp.enableNativeDistributionCommonizationCache=true") { build(":p1:commonize", "--rerun-tasks", "-Pkotlin.mpp.enableNativeDistributionCommonizationCache=true") {
assertTasksExecuted(":p1:commonizeNativeDistribution") assertTasksExecuted(":p1:commonizeNativeDistribution")
assertContains("Native Distribution Commonization: Cache hit") assertContains("Native Distribution Commonization: Cache hit")
assertNotContains("Kotlin KLIB commonizer:") assertNotContains(commonizerOutput)
assertSuccessful() assertSuccessful()
} }
build(":p1:commonize", "--rerun-tasks", "-Pkotlin.mpp.enableNativeDistributionCommonizationCache=false") { build(":p1:commonize", "--rerun-tasks", "-Pkotlin.mpp.enableNativeDistributionCommonizationCache=false") {
assertTasksExecuted(":p1:commonizeNativeDistribution") assertTasksExecuted(":p1:commonizeNativeDistribution")
assertContains("Native Distribution Commonization: Cache disabled") assertContains("Native Distribution Commonization: Cache disabled")
assertContains("Kotlin KLIB commonizer:") assertContains(commonizerOutput)
assertSuccessful() assertSuccessful()
} }
} }
@@ -16,7 +16,7 @@ internal abstract class Task(private val options: Collection<Option<*>>) : Compa
// Important: the order of entries affects that order of tasks execution // Important: the order of entries affects that order of tasks execution
INFORMATIONAL, INFORMATIONAL,
COMMONIZATION( COMMONIZATION(
prologue = "\nKotlin KLIB commonizer: Please wait while preparing libraries.", prologue = null,
epilogue = "\n", epilogue = "\n",
logEachStep = true logEachStep = true
) )