diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesTestExecutor.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesTestExecutor.kt index b9b87470a4c..3aaa7231a30 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesTestExecutor.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/testing/TCServiceMessagesTestExecutor.kt @@ -1,3 +1,8 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + package org.jetbrains.kotlin.gradle.internal.testing import org.gradle.api.internal.tasks.testing.TestExecuter @@ -78,7 +83,9 @@ class TCServiceMessagesTestExecutor( override fun stopNow() { shouldStop = true - execHandle?.abort() + if (::execHandle.isInitialized) { + execHandle.abort() + } outputReaderThread?.join() } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt index a9d5a6dcfc2..e53e5cb3d23 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt @@ -423,7 +423,6 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : progressLogger.progress(value) parseConsole(value) - super.printNonTestOutput(text) } private fun parseConsole(text: String) { @@ -446,6 +445,8 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : INFO, LOG -> log.info(nonColoredMessage) DEBUG -> log.debug(nonColoredMessage) } + } else { + super.printNonTestOutput(text) } }