From 1c055b3b23bc0de0fbf1807f6682734eda7b1424 Mon Sep 17 00:00:00 2001 From: Vladimir Sukharev Date: Wed, 15 Feb 2023 18:08:08 +0000 Subject: [PATCH] Use proper way to remove Windows \r char for LF(EOL) Merge-request: KT-MR-8850 Merged-by: Vladimir Sukharev --- .../konan/blackboxtest/AbstractNativeKlibContentsTest.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibContentsTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibContentsTest.kt index 5e4858dcc2c..a07545418ed 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibContentsTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibContentsTest.kt @@ -15,7 +15,6 @@ import org.jetbrains.kotlin.konan.blackboxtest.support.runner.* import org.jetbrains.kotlin.konan.blackboxtest.support.settings.* import org.jetbrains.kotlin.konan.blackboxtest.support.util.* import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertEquals -import org.jetbrains.kotlin.test.util.convertLineSeparators import org.junit.jupiter.api.Tag import java.io.File @@ -57,7 +56,7 @@ abstract class AbstractNativeKlibContentsTest : AbstractNativeSimpleTest() { } private fun filterContentsOutput(contents: String, linestoExclude: List) = - contents.convertLineSeparators() + StringUtilRt.convertLineSeparators(contents) .split("\n") .filterNot { line -> linestoExclude.any { exclude -> exclude == line }