Gradle, js, karma: show output as progress

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesClient.kt

@@ -80,10 +80,14 @@ internal open class TCServiceMessagesClient(
         if (test != null) {
             test.output(StdOut, actualText)
         } else {
-            print(actualText)
+            printNonTestOutput(actualText)
         }
     }
 
+    protected open fun printNonTestOutput(actualText: String) {
+        print(actualText)
+    }
+
     protected open val testNameSuffix: String?
         get() = settings.testNameSuffix
 

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesTestExecutor.kt

@@ -22,6 +22,9 @@ open class TCServiceMessagesTestExecutionSpec(
 ) : TestExecutionSpec {
     internal open fun createClient(testResultProcessor: TestResultProcessor, log: Logger): TCServiceMessagesClient =
         TCServiceMessagesClient(testResultProcessor, clientSettings, log)
+
+    internal open fun wrapExecute(body: () -> Unit) = body()
+    internal open fun showSuppressedOutput() = Unit
 }
 
 private val log = LoggerFactory.getLogger("org.jetbrains.kotlin.gradle.tasks.testing")
@@ -35,6 +38,7 @@ class TCServiceMessagesTestExecutor(
     var shouldStop = false
 
     override fun execute(spec: TCServiceMessagesTestExecutionSpec, testResultProcessor: TestResultProcessor) {
+        spec.wrapExecute {
             val stdInPipe = PipedInputStream()
 
             val rootOperation = buildOperationExecutor.currentOperation.parentId
@@ -54,6 +58,7 @@ class TCServiceMessagesTestExecutor(
                                 try {
                                     ServiceMessage.parse(it, client)
                                 } catch (e: Exception) {
+                                    spec.showSuppressedOutput()
                                     log.error(
                                         "Error while processing test process output message \"$it\"",
                                         e
@@ -63,6 +68,7 @@ class TCServiceMessagesTestExecutor(
                         }
                     }
                 } catch (t: Throwable) {
+                    spec.showSuppressedOutput()
                     log.error("Error creating TCServiceMessagesClient", t)
                 }
             }
@@ -79,9 +85,11 @@ class TCServiceMessagesTestExecutor(
             outputReaderThread!!.join()
 
             if (spec.checkExitCode && result.exitValue != 0) {
+                spec.showSuppressedOutput()
                 error("$execHandle exited with errors (exit code: ${result.exitValue})")
             }
         }
+    }
 
     override fun stopNow() {
         shouldStop = true

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt

@@ -9,7 +9,9 @@ import com.google.gson.GsonBuilder
 import jetbrains.buildServer.messages.serviceMessages.BaseTestSuiteMessage
 import org.gradle.api.Project
 import org.gradle.api.internal.tasks.testing.TestResultProcessor
+import org.gradle.internal.logging.progress.ProgressLogger
 import org.gradle.process.ProcessForkOptions
+import org.jetbrains.kotlin.gradle.internal.operation
 import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesClient
 import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesClientSettings
 import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutionSpec
@@ -221,8 +223,27 @@ class KotlinKarma(val project: Project) : KotlinJsTestFramework {
             false,
             clientSettings
         ) {
+            lateinit var progressLogger: ProgressLogger
+            val suppressedOutput = StringBuilder()
+
+            override fun wrapExecute(body: () -> Unit) {
+                project.operation("Running and building tests with karma and webpack") {
+                    progressLogger = this
+                    body()
+                }
+            }
+
+            override fun showSuppressedOutput() {
+                println(suppressedOutput)
+            }
+
             override fun createClient(testResultProcessor: TestResultProcessor, log: Logger) =
                 object : TCServiceMessagesClient(testResultProcessor, clientSettings, log) {
+                    override fun printNonTestOutput(actualText: String) {
+                        suppressedOutput.appendln(actualText)
+                        progressLogger.progress(actualText)
+                    }
+
                     val baseTestNameSuffix get() = settings.testNameSuffix
                     override var testNameSuffix: String? = baseTestNameSuffix