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

[K2/N] Fix test on Windows: remove \r from compared strings

Browse Source 
Address reviewer's comment

Fix test on Windows: remove \r from compared strings

Merge-request: KT-MR-8799
Merged-by: Vladimir Sukharev <Vladimir.Sukharev@jetbrains.com>
This commit is contained in:
Vladimir Sukharev
2023-02-14 14:46:27 +00:00
committed by Space Team
parent ee32fddbfe
commit babd52e27a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibContentsTest.kt
+6 -4
View File
@@ -15,7 +15,7 @@ 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.junit.jupiter.api.Assumptions 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 +57,9 @@ abstract class AbstractNativeKlibContentsTest : AbstractNativeSimpleTest() {
} }
private fun filterContentsOutput(contents: String, linestoExclude: List<String>) = private fun filterContentsOutput(contents: String, linestoExclude: List<String>) =
contents.split("\n").filterNot { line -> contents.convertLineSeparators()
linestoExclude.any { exclude -> exclude == line } .split("\n")
}.joinToString(separator = "\n") .filterNot { line ->
linestoExclude.any { exclude -> exclude == line }
}.joinToString(separator = "\n")
} }