From ebc8002eb20048ab13734c3050144185f3be4230 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Wed, 12 Oct 2016 20:29:49 +0200
Subject: [PATCH] Fix output comparison in tests under windows in libraries
 project as well

---
 .../org/jetbrains/kotlin/script/util/ScriptUtilIT.kt     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/util/ScriptUtilIT.kt b/libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/util/ScriptUtilIT.kt
index bb304975d31..bf437e2ff5b 100644
--- a/libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/util/ScriptUtilIT.kt
+++ b/libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/util/ScriptUtilIT.kt
@@ -66,7 +66,7 @@ done
         captureOut {
             ctor!!.newInstance(arrayOf("a1"))
         }.let {
-            Assert.assertEquals(argsHelloWorldOutput, it)
+            Assert.assertEquals(argsHelloWorldOutput.linesSplitTrim(), it.linesSplitTrim())
         }
     }
 
@@ -79,7 +79,7 @@ done
         captureOut {
             ctor!!.newInstance(hashMapOf("a1" to 42))
         }.let {
-            Assert.assertEquals(bindingsHelloWorldOutput, it)
+            Assert.assertEquals(bindingsHelloWorldOutput.linesSplitTrim(), it.linesSplitTrim())
         }
     }
 
@@ -96,7 +96,7 @@ done
         captureOut {
             scriptClass!!.getConstructor(Array<String>::class.java)!!.newInstance(arrayOf("a1"))
         }.let {
-            Assert.assertEquals(argsHelloWorldOutput, it)
+            Assert.assertEquals(argsHelloWorldOutput.linesSplitTrim(), it.linesSplitTrim())
         }
     }
 
@@ -175,6 +175,9 @@ done
         default
     }
 
+    private fun String.linesSplitTrim() =
+            split('\n','\r').map(String::trim).filter(String::isNotBlank)
+
     private fun captureOut(body: () -> Unit): String {
         val outStream = ByteArrayOutputStream()
         val prevOut = System.out