From d8ecd2641d55b7bfca7644214a1e7a60c5580436 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Wed, 12 Oct 2016 20:16:15 +0200
Subject: [PATCH] Fix script tests output comparison and idea jsr223 test
 dependency on windows

---
 .../tests/org/jetbrains/kotlin/scripts/scriptTestsUtil.kt    | 5 ++++-
 idea/idea.iml                                                | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/compiler/tests/org/jetbrains/kotlin/scripts/scriptTestsUtil.kt b/compiler/tests/org/jetbrains/kotlin/scripts/scriptTestsUtil.kt
index ad38373e77d..ae5040a6a0d 100644
--- a/compiler/tests/org/jetbrains/kotlin/scripts/scriptTestsUtil.kt
+++ b/compiler/tests/org/jetbrains/kotlin/scripts/scriptTestsUtil.kt
@@ -49,5 +49,8 @@ internal fun captureOut(body: () -> Unit): String {
     return outStream.toString()
 }
 
+private fun String.linesSplitTrim() =
+        split('\n','\r').map(String::trim).filter(String::isNotBlank)
+
 internal fun assertEqualsTrimmed(expected: String, actual: String) =
-        Assert.assertEquals(expected.trim(), actual.trim())
+        Assert.assertEquals(expected.linesSplitTrim(), actual.linesSplitTrim())
diff --git a/idea/idea.iml b/idea/idea.iml
index 96f1799772f..ddb7d7af13b 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -54,5 +54,6 @@
     <orderEntry type="library" name="java-decompiler-plugin" level="project" />
     <orderEntry type="module" module-name="formatter" />
     <orderEntry type="module" module-name="idea-maven" />
+    <orderEntry type="library" scope="TEST" name="native-platform-uberjar" level="project" />
   </component>
 </module>
\ No newline at end of file