azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix TCServiceMessagesClient not removing an empty line prefix on Windows

Browse Source
This commit is contained in:
Sergey Igushkin
2019-08-07 01:58:58 +03:00
parent 471b515adb
commit ec54246b3a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesClient.kt
+7 -1
View File
@@ -79,7 +79,13 @@ internal open class TCServiceMessagesClient(
protected open fun getSuiteName(message: BaseTestSuiteMessage) = message.suiteName protected open fun getSuiteName(message: BaseTestSuiteMessage) = message.suiteName
override fun regularText(text: String) { 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()) { if (actualText.isNotEmpty()) {
log.kotlinDebug { "TCSM stdout captured: $actualText" } log.kotlinDebug { "TCSM stdout captured: $actualText" }