From ec54246b3ae3391cf1a32f3abe9bcbbe6deaddf1 Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Wed, 7 Aug 2019 01:58:58 +0300 Subject: [PATCH] Fix TCServiceMessagesClient not removing an empty line prefix on Windows --- .../gradle/internal/testing/TCServiceMessagesClient.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesClient.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesClient.kt index a41fb566656..51ae056f5ff 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesClient.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesClient.kt @@ -79,7 +79,13 @@ internal open class TCServiceMessagesClient( protected open fun getSuiteName(message: BaseTestSuiteMessage) = message.suiteName override fun regularText(text: String) { - val actualText = if (afterMessage && settings.ignoreLineEndingAfterMessage) text.removePrefix("\n") else text + val actualText = if (afterMessage && settings.ignoreLineEndingAfterMessage) + when { + text.startsWith("\r\n") -> text.removePrefix("\r\n") + else -> text.removePrefix("\n") + } + else text + if (actualText.isNotEmpty()) { log.kotlinDebug { "TCSM stdout captured: $actualText" }