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

Use proper way to remove Windows \r char for LF(EOL)

Browse Source 
Merge-request: KT-MR-8850
Merged-by: Vladimir Sukharev <Vladimir.Sukharev@jetbrains.com>
This commit is contained in:
Vladimir Sukharev
2023-02-15 18:08:08 +00:00
committed by Space Team
parent 81c1014391
commit 1c055b3b23
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibContentsTest.kt
+1 -2
View File
@@ -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.settings.*
import org.jetbrains.kotlin.konan.blackboxtest.support.util.* import org.jetbrains.kotlin.konan.blackboxtest.support.util.*
import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertEquals import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertEquals
import org.jetbrains.kotlin.test.util.convertLineSeparators
import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Tag
import java.io.File import java.io.File
@@ -57,7 +56,7 @@ abstract class AbstractNativeKlibContentsTest : AbstractNativeSimpleTest() {
} }
private fun filterContentsOutput(contents: String, linestoExclude: List<String>) = private fun filterContentsOutput(contents: String, linestoExclude: List<String>) =
contents.convertLineSeparators() StringUtilRt.convertLineSeparators(contents)
.split("\n") .split("\n")
.filterNot { line -> .filterNot { line ->
linestoExclude.any { exclude -> exclude == line } linestoExclude.any { exclude -> exclude == line }