From 48f2db51d2da1e64cd5255fa9b52e2c7961db1bf Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 11 Mar 2021 12:22:55 +0300 Subject: [PATCH] Stop polluting output for successful Gradle tests --- .../kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt index f472fb0ee85..c16c11bd68b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt @@ -340,20 +340,21 @@ abstract class BaseGradleIT { val cmd = createBuildCommand(wrapperDir, params, options) - println("<=== Test build: ${this.projectName} $cmd ===>") - if (!projectDir.exists()) { setupWorkingDir() } maybeUpdateSettingsScript(wrapperVersion, gradleSettingsScript()) - val result = runProcess(cmd, projectDir, env, options) + var result: ProcessRunResult? = null try { + result = runProcess(cmd, projectDir, env, options) CompiledProject(this, result.output, result.exitCode).check() } catch (t: Throwable) { + println("<=== Test build: ${this.projectName} $cmd ===>") + // to prevent duplication of output - if (!options.forceOutputToStdout) { + if (!options.forceOutputToStdout && result != null) { println(result.output) } throw t