From 87db245dd873f624682c11293d335740de0c37d3 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 28 Apr 2017 14:15:03 +0300 Subject: [PATCH] KJS: fix JS backend tests on windows --- .../test/org/jetbrains/kotlin/js/test/NashornJsTestChecker.kt | 2 +- .../kotlin/js/test/semantics/AbstractWebDemoExamplesTest.kt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/NashornJsTestChecker.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/NashornJsTestChecker.kt index 8826ec27f9b..f0793b38ef3 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/NashornJsTestChecker.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/NashornJsTestChecker.kt @@ -28,7 +28,7 @@ fun createScriptEngine(): ScriptEngine = NashornScriptEngineFactory().getScriptEngine("--language=es5", "--no-java", "--no-syntax-extensions") private fun ScriptEngine.loadFile(path: String) { - eval("load('$path');") + eval("load('${path.replace('\\', '/')}');") } private fun ScriptObjectMirror.toMapWithAllMembers(): Map = getOwnKeys(true).associate { it to this[it] } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractWebDemoExamplesTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractWebDemoExamplesTest.kt index 62621b25454..ef1bc863efe 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractWebDemoExamplesTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractWebDemoExamplesTest.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.js.test.semantics import com.google.common.collect.Lists +import com.intellij.openapi.util.text.StringUtil import org.jetbrains.kotlin.js.facade.MainCallParameters import org.jetbrains.kotlin.js.test.BasicBoxTest import org.jetbrains.kotlin.js.test.NashornJsTestChecker @@ -45,7 +46,7 @@ abstract class AbstractWebDemoExamplesTest(relativePath: String) : BasicBoxTest( } protected fun runMainAndCheckOutputWithExpectedFile(testName: String, testId: String, vararg args: String) { - val expectedResult = File(pathToTestDir + testName + testId + ".out").readText() + val expectedResult = StringUtil.convertLineSeparators(File(pathToTestDir + testName + testId + ".out").readText()) doTest(pathToTestDir + testName + ".kt", expectedResult, MainCallParameters.mainWithArguments(Lists.newArrayList(*args))) } } \ No newline at end of file