From bfde8eda811732c63a781efe977e4e44ab2b54df Mon Sep 17 00:00:00 2001
From: Alexander Likhachev <Alexander.Likhachev@jetbrains.com>
Date: Tue, 3 Jan 2023 19:05:52 +0100
Subject: [PATCH] [Gradle] Do not check for configuration cache report file
 existence

This file is generated even if there's no problems since Gradle 7.4. It now contains useful information to determine configuration inputs. Rely on the configuration cache problems option instead.
#KT-52625 In Progress
---
 .../kotlin/gradle/ConfigurationCacheIT.kt     |  3 --
 .../testbase/configurationCacheHelpers.kt     | 34 -------------------
 2 files changed, 37 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt
index 762c1cc0f1f..e8f4be3bb27 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt
@@ -109,7 +109,6 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
             testConfigurationCacheOf(
                 "build",
                 executedTaskNames = expectedTasks,
-                checkConfigurationCacheFileReport = false,
                 buildOptions = defaultBuildOptions.copy(
                     configurationCacheProblems = BaseGradleIT.ConfigurationCacheProblems.FAIL,
                     warningMode = WarningMode.All,
@@ -264,14 +263,12 @@ abstract class AbstractConfigurationCacheIT : KGPBaseTest() {
         vararg taskNames: String,
         executedTaskNames: List<String>? = null,
         checkUpToDateOnRebuild: Boolean = true,
-        checkConfigurationCacheFileReport: Boolean = true,
         buildOptions: BuildOptions = defaultBuildOptions
     ) {
         assertSimpleConfigurationCacheScenarioWorks(
             *taskNames,
             executedTaskNames = executedTaskNames,
             checkUpToDateOnRebuild = checkUpToDateOnRebuild,
-            checkConfigurationCacheFileReport = checkConfigurationCacheFileReport,
             buildOptions = buildOptions,
         )
     }
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/configurationCacheHelpers.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/configurationCacheHelpers.kt
index 2b4654dc38a..5b3bb6bbae2 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/configurationCacheHelpers.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/configurationCacheHelpers.kt
@@ -22,7 +22,6 @@ fun TestProject.assertSimpleConfigurationCacheScenarioWorks(
     buildOptions: BuildOptions,
     executedTaskNames: List<String>? = null,
     checkUpToDateOnRebuild: Boolean = true,
-    checkConfigurationCacheFileReport: Boolean = true,
 ) {
     // First, run a build that serializes the tasks state for configuration cache in further builds
 
@@ -35,7 +34,6 @@ fun TestProject.assertSimpleConfigurationCacheScenarioWorks(
         )
 
         assertOutputContains("Configuration cache entry stored.")
-        if (checkConfigurationCacheFileReport) assertConfigurationCacheReportNotCreated()
     }
 
     build("clean", buildOptions = buildOptions)
@@ -53,38 +51,6 @@ fun TestProject.assertSimpleConfigurationCacheScenarioWorks(
     }
 }
 
-/**
- * Copies all files from the directory containing the given [htmlReportFile] to a
- * fresh temp dir and returns a reference to the copied [htmlReportFile] in the new
- * directory.
- */
-@OptIn(ExperimentalPathApi::class)
-private fun copyReportToTempDir(htmlReportFile: Path): Path =
-    createTempDirDeleteOnExit("report").let { tempDir ->
-        htmlReportFile.parent.toFile().copyRecursively(tempDir.toFile())
-        tempDir.resolve(htmlReportFile.name)
-    }
-
-/**
- * The configuration cache report file, if exists, indicates problems were
- * found while caching the task graph.
- */
-private val GradleProject.configurationCacheReportFile
-    get() = projectPath
-        .resolve("build")
-        .takeIf { it.exists() }
-        ?.findInPath("configuration-cache-report.html")
-        ?.let { copyReportToTempDir(it) }
-
-private val Path.asClickableFileUrl
-    get() = URI("file", "", toUri().path, null, null).toString()
-
-private fun GradleProject.assertConfigurationCacheReportNotCreated() {
-    configurationCacheReportFile?.let { htmlReportFile ->
-        fail("Configuration cache problems were found, check ${htmlReportFile.asClickableFileUrl} for details.")
-    }
-}
-
 fun BuildResult.assertConfigurationCacheReused() {
     assertOutputContains("Reusing configuration cache.")
 }