[Gradle] Disable the Kotlin daemon fallback strategy for integration tests
#KT-57782 Fixed
This commit is contained in:
committed by
Space Team
parent
f7522ec796
commit
0d1500f23f
+3
@@ -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())}")
|
||||
|
||||
|
||||
+2
-1
@@ -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()
|
||||
|
||||
+3
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user