From a2ad9026a63fad3af94d058b3bfea223b2941487 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Mon, 22 Nov 2021 16:44:46 +0300 Subject: [PATCH] [Native][tests] Make file content comparison to be OS-neutral --- .../konan/blackboxtest/support/runner/LocalTestRunner.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/LocalTestRunner.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/LocalTestRunner.kt index 95458743684..08d790814c5 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/LocalTestRunner.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/LocalTestRunner.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.konan.blackboxtest.support.runner +import com.intellij.openapi.util.text.StringUtilRt.convertLineSeparators import org.jetbrains.kotlin.konan.blackboxtest.support.* import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail @@ -100,7 +101,7 @@ internal class LocalTestRunner(private val testRun: TestRun) : AbstractLocalProc private fun verifyOutputData(mergedOutput: String) { testRun.runParameters.get { - verifyExpectation(expectedOutputDataFile.readText(), mergedOutput) { + verifyExpectation(convertLineSeparators(expectedOutputDataFile.readText()), convertLineSeparators(mergedOutput)) { "Tested process output mismatch. See \"TEST STDOUT\" and \"EXPECTED OUTPUT DATA FILE\" below." } }