From 0d1500f23fe85c2ed19954999fd29055a447c3c6 Mon Sep 17 00:00:00 2001
From: "Alexander.Likhachev" <Alexander.Likhachev@jetbrains.com>
Date: Tue, 4 Apr 2023 16:29:48 +0200
Subject: [PATCH] [Gradle] Disable the Kotlin daemon fallback strategy for
 integration tests

#KT-57782 Fixed
---
 .../test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt    | 3 +++
 .../kotlin/org/jetbrains/kotlin/gradle/ExecutionStrategyIT.kt  | 3 ++-
 .../org/jetbrains/kotlin/gradle/testbase/BuildOptions.kt       | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

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 16490f2bd16..2d62ade67c3 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
@@ -283,6 +283,7 @@ abstract class BaseGradleIT {
         val enableCompatibilityMetadataVariant: Boolean? = null,
         val withReports: List<BuildReportType> = emptyList(),
         val enableKpmModelMapping: Boolean? = null,
+        val useDaemonFallbackStrategy: Boolean = false,
     ) {
         val safeAndroidGradlePluginVersion: AGPVersion
             get() = androidGradlePluginVersion ?: error("AGP version is expected to be set")
@@ -961,6 +962,8 @@ abstract class BaseGradleIT {
                 add("-Pkotlin.kpm.experimentalModelMapping=${options.enableKpmModelMapping}")
             }
 
+            add("-Pkotlin.daemon.useFallbackStrategy=${options.useDaemonFallbackStrategy}")
+
             add("-Dorg.gradle.unsafe.configuration-cache=${options.configurationCache}")
             add("-Dorg.gradle.unsafe.configuration-cache-problems=${options.configurationCacheProblems.name.lowercase(Locale.getDefault())}")
 
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ExecutionStrategyIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ExecutionStrategyIT.kt
index 3d1e857da58..b3ab86ea4ce 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ExecutionStrategyIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ExecutionStrategyIT.kt
@@ -193,7 +193,8 @@ abstract class ExecutionStrategyIT : KGPDaemonsBaseTest() {
         project(
             projectName = "kotlinBuiltins",
             gradleVersion = gradleVersion,
-            addHeapDumpOptions = addHeapDumpOptions
+            addHeapDumpOptions = addHeapDumpOptions,
+            buildOptions = defaultBuildOptions.copy(useDaemonFallbackStrategy = testFallbackStrategy)
         ) {
             setupProject(this)
             additionalProjectConfiguration()
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/BuildOptions.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/BuildOptions.kt
index 4b216e873cc..c7c6a205740 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/BuildOptions.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/BuildOptions.kt
@@ -41,6 +41,7 @@ data class BuildOptions(
     val statisticsForceValidation: Boolean = true,
     val usePreciseOutputsBackup: Boolean? = null,
     val keepIncrementalCompilationCachesInMemory: Boolean? = null,
+    val useDaemonFallbackStrategy: Boolean = false,
 ) {
     val safeAndroidVersion: String
         get() = androidVersion ?: error("AGP version is expected to be set")
@@ -162,6 +163,8 @@ data class BuildOptions(
             arguments.add("-Pkotlin.compiler.keepIncrementalCompilationCachesInMemory=$keepIncrementalCompilationCachesInMemory")
         }
 
+        arguments.add("-Pkotlin.daemon.useFallbackStrategy=$useDaemonFallbackStrategy")
+
         arguments.addAll(freeArgs)
 
         return arguments.toList()