From 90238978ee1e4b7cf3c799025c76be770801fc4a Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Tue, 8 Jun 2021 15:16:34 +0200
Subject: [PATCH] Update block to print build info on error.

^KT-45745 In Progress
---
 .../kotlin/gradle/testbase/testDsl.kt         | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt
index 571b818c385..003d244bda1 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt
@@ -71,14 +71,13 @@ fun TestProject.build(
     assertions: BuildResult.() -> Unit = {}
 ) {
     val allBuildArguments = commonBuildSetup(buildArguments.toList())
-    withBuildSummary(allBuildArguments) {
-        val buildResult = gradleRunner
-            .also { if (forceOutput) it.forwardOutput() }
-            .withArguments(allBuildArguments)
-            .build()
-
-        assertions(buildResult)
+    val gradleRunnerForBuild = gradleRunner
+        .also { if (forceOutput) it.forwardOutput() }
+        .withArguments(allBuildArguments)
+    val buildResult = withBuildSummary(allBuildArguments) {
+        gradleRunnerForBuild.build()
     }
+    assertions(buildResult)
 }
 
 /**
@@ -90,14 +89,14 @@ fun TestProject.buildAndFail(
     assertions: BuildResult.() -> Unit = {}
 ) {
     val allBuildArguments = commonBuildSetup(buildArguments.toList())
-    withBuildSummary(allBuildArguments) {
-        val buildResult = gradleRunner
-            .also { if (forceOutput) it.forwardOutput() }
-            .withArguments(allBuildArguments)
-            .buildAndFail()
-
-        assertions(buildResult)
+    val gradleRunnerForBuild = gradleRunner
+        .also { if (forceOutput) it.forwardOutput() }
+        .withArguments(allBuildArguments)
+    val buildResult = withBuildSummary(allBuildArguments) {
+        gradleRunnerForBuild.buildAndFail()
     }
+
+    assertions(buildResult)
 }
 
 fun TestProject.enableLocalBuildCache(
@@ -140,16 +139,17 @@ private fun TestProject.commonBuildSetup(
     return buildOptionsArguments + buildArguments + "--full-stacktrace"
 }
 
-private fun TestProject.withBuildSummary(buildArguments: List<String>, run: () -> Unit) {
-    try {
-        run()
-    } catch (t: Throwable) {
-        println("<=== Test build: ${projectName} ===>")
-        println("<=== Using Gradle version: ${gradleVersion.version} ===>")
-        println("<=== Run arguments: ${buildArguments.joinToString()} ===>")
-        println("<=== Project path:  ${projectPath.toAbsolutePath()} ===>")
-        throw t
-    }
+private fun TestProject.withBuildSummary(
+    buildArguments: List<String>,
+    run: () -> BuildResult
+): BuildResult = try {
+    run()
+} catch (t: Throwable) {
+    println("<=== Test build: $projectName ===>")
+    println("<=== Using Gradle version: ${gradleVersion.version} ===>")
+    println("<=== Run arguments: ${buildArguments.joinToString()} ===>")
+    println("<=== Project path:  ${projectPath.toAbsolutePath()} ===>")
+    throw t
 }
 
 /**