From 423a48c7c3b62354956352085cd635a0e4422bfb Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Sun, 10 Aug 2014 19:00:44 +0400
Subject: [PATCH] Gradle tests: output compiler process stdout and stderr

---
 .../jetbrains/kotlin/gradle/BaseGradleIT.kt    | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-test/src/main/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-test/src/main/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
index 7a268ba930f..8930d033b42 100644
--- a/libraries/tools/kotlin-gradle-plugin-test/src/main/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-test/src/main/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
@@ -2,6 +2,7 @@ package org.jetbrains.kotlin.gradle
 
 import com.google.common.io.Files
 import java.io.File
+import java.io.InputStream
 import java.util.Scanner
 import org.junit.Before
 import org.junit.After
@@ -76,16 +77,19 @@ open class BaseGradleIT(resourcesRoot: String = "src/test/resources") {
     }
 
     private fun readOutput(process: Process): Pair<String, Int> {
-        val s = Scanner(process.getInputStream()!!)
-        val text = StringBuilder()
-        while (s.hasNextLine()) {
-            text append s.nextLine()
-            text append "\n"
+        fun InputStream.readFully(): String {
+            val text = reader().readText()
+            close()
+            return text
         }
-        s.close()
+
+        val stdout = process.getInputStream()!!.readFully()
+        System.out.println(stdout)
+        val stderr = process.getErrorStream()!!.readFully()
+        System.err.println(stderr)
 
         val result = process.waitFor()
-        return text.toString() to result
+        return stdout to result
     }
 
     fun copyRecursively(source: File, target: File) {