[Gradle, JS] Fix formatting logic

#KT-38109 fixed
This commit is contained in:
Ilya Goncharov
2020-04-10 13:17:27 +03:00
parent 7347c44cb1
commit 47d7424d4d
2 changed files with 10 additions and 2 deletions
@@ -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 package org.jetbrains.kotlin.gradle.internal.testing
import org.gradle.api.internal.tasks.testing.TestExecuter import org.gradle.api.internal.tasks.testing.TestExecuter
@@ -78,7 +83,9 @@ class TCServiceMessagesTestExecutor(
override fun stopNow() { override fun stopNow() {
shouldStop = true shouldStop = true
execHandle?.abort() if (::execHandle.isInitialized) {
execHandle.abort()
}
outputReaderThread?.join() outputReaderThread?.join()
} }
@@ -423,7 +423,6 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) :
progressLogger.progress(value) progressLogger.progress(value)
parseConsole(value) parseConsole(value)
super.printNonTestOutput(text)
} }
private fun parseConsole(text: String) { private fun parseConsole(text: String) {
@@ -446,6 +445,8 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) :
INFO, LOG -> log.info(nonColoredMessage) INFO, LOG -> log.info(nonColoredMessage)
DEBUG -> log.debug(nonColoredMessage) DEBUG -> log.debug(nonColoredMessage)
} }
} else {
super.printNonTestOutput(text)
} }
} }