[Gradle] Enable in-memory wrappers for the precise outputs backup tests

#KT-56052 In Progress
This commit is contained in:
Alexander.Likhachev
2023-01-30 21:51:49 +01:00
committed by Space Team
parent ca8d0bd100
commit ae75736864
9 changed files with 15 additions and 10 deletions
@@ -71,5 +71,5 @@ open class CompilerPluginsIncrementalIT : KGPBaseTest() {
@DisplayName("Compiler plugin incremental compilation with precise compilation outputs backup") @DisplayName("Compiler plugin incremental compilation with precise compilation outputs backup")
class CompilerPluginsIncrementalWithPreciseBackupIT : CompilerPluginsIncrementalIT() { class CompilerPluginsIncrementalWithPreciseBackupIT : CompilerPluginsIncrementalIT() {
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true) override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true)
} }
@@ -138,7 +138,7 @@ open class IncrementalCompilationJsMultiProjectIT : BaseIncrementalCompilationMu
} }
class IncrementalCompilationJsMultiProjectWithPreciseBackupIT : IncrementalCompilationJsMultiProjectIT() { class IncrementalCompilationJsMultiProjectWithPreciseBackupIT : IncrementalCompilationJsMultiProjectIT() {
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true) override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true)
} }
@JvmGradlePluginTests @JvmGradlePluginTests
@@ -299,7 +299,7 @@ open class IncrementalCompilationJvmMultiProjectIT : BaseIncrementalCompilationM
} }
class IncrementalCompilationJvmMultiProjectWithPreciseBackupIT : IncrementalCompilationJvmMultiProjectIT() { class IncrementalCompilationJvmMultiProjectWithPreciseBackupIT : IncrementalCompilationJvmMultiProjectIT() {
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true) override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true)
} }
class IncrementalCompilationFirJvmMultiProjectIT : IncrementalCompilationJvmMultiProjectIT() { class IncrementalCompilationFirJvmMultiProjectIT : IncrementalCompilationJvmMultiProjectIT() {
@@ -440,7 +440,7 @@ open class IncrementalCompilationOldICJvmMultiProjectIT : IncrementalCompilation
} }
class IncrementalCompilationOldICJvmMultiProjectWithPreciseBackupIT : IncrementalCompilationOldICJvmMultiProjectIT() { class IncrementalCompilationOldICJvmMultiProjectWithPreciseBackupIT : IncrementalCompilationOldICJvmMultiProjectIT() {
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true) override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true)
} }
abstract class BaseIncrementalCompilationMultiProjectIT : IncrementalCompilationBaseIT() { abstract class BaseIncrementalCompilationMultiProjectIT : IncrementalCompilationBaseIT() {
@@ -93,7 +93,7 @@ open class IncrementalJavaChangeDefaultIT : IncrementalCompilationJavaChangesBas
@DisplayName("Default incremental compilation with precise compilation outputs backup") @DisplayName("Default incremental compilation with precise compilation outputs backup")
open class IncrementalJavaChangePreciseCompilationBackupIT : IncrementalJavaChangeDefaultIT() { open class IncrementalJavaChangePreciseCompilationBackupIT : IncrementalJavaChangeDefaultIT() {
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true) override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true)
} }
@DisplayName("Incremental compilation via classpath snapshots with default precise java tracking") @DisplayName("Incremental compilation via classpath snapshots with default precise java tracking")
@@ -391,5 +391,5 @@ open class KaptIncrementalIT : KGPBaseTest() {
@DisplayName("Kapt incremental compilation with precise compilation outputs backup") @DisplayName("Kapt incremental compilation with precise compilation outputs backup")
class KaptIncrementalWithPreciseBackupIT : KaptIncrementalIT() { class KaptIncrementalWithPreciseBackupIT : KaptIncrementalIT() {
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true) override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true)
} }
@@ -392,5 +392,5 @@ open class KaptIncrementalWithAggregatingApt : KaptIncrementalIT() {
@DisplayName("Kapt incremental tests with aggregating apt with precise compilation outputs backup") @DisplayName("Kapt incremental tests with aggregating apt with precise compilation outputs backup")
class KaptIncrementalWithAggregatingAptAndPreciseBackup : KaptIncrementalWithAggregatingApt() { class KaptIncrementalWithAggregatingAptAndPreciseBackup : KaptIncrementalWithAggregatingApt() {
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true) override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true)
} }
@@ -431,7 +431,7 @@ open class KaptIncrementalWithIsolatingApt : KaptIncrementalIT() {
@DisplayName("Kapt incremental tests with isolating apt with precise compilation outputs backup") @DisplayName("Kapt incremental tests with isolating apt with precise compilation outputs backup")
class KaptIncrementalWithIsolatingAptAndPreciseBackup : KaptIncrementalWithIsolatingApt() { class KaptIncrementalWithIsolatingAptAndPreciseBackup : KaptIncrementalWithIsolatingApt() {
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true) override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true)
} }
private const val patternApt = "Processing java sources with annotation processors:" private const val patternApt = "Processing java sources with annotation processors:"
@@ -206,5 +206,5 @@ open class Kapt3AndroidIncrementalIT : Kapt3BaseIT() {
@DisplayName("android with kapt3 incremental build tests with precise compilation outputs backup") @DisplayName("android with kapt3 incremental build tests with precise compilation outputs backup")
class Kapt3AndroidIncrementalWithPreciseBackupIT : Kapt3AndroidIncrementalIT() { class Kapt3AndroidIncrementalWithPreciseBackupIT : Kapt3AndroidIncrementalIT() {
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true) override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true)
} }
@@ -180,5 +180,5 @@ open class KotlinAndroidIncrementalIT : KGPBaseTest() {
} }
class KotlinAndroidIncrementalWithPreciseBackupIT : KotlinAndroidIncrementalIT() { class KotlinAndroidIncrementalWithPreciseBackupIT : KotlinAndroidIncrementalIT() {
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true) override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true)
} }
@@ -40,6 +40,7 @@ data class BuildOptions(
val freeArgs: List<String> = emptyList(), val freeArgs: List<String> = emptyList(),
val statisticsForceValidation: Boolean = true, val statisticsForceValidation: Boolean = true,
val usePreciseOutputsBackup: Boolean? = null, val usePreciseOutputsBackup: Boolean? = null,
val keepIncrementalCompilationCachesInMemory: Boolean? = null,
) { ) {
val safeAndroidVersion: String val safeAndroidVersion: String
get() = androidVersion ?: error("AGP version is expected to be set") get() = androidVersion ?: error("AGP version is expected to be set")
@@ -159,6 +160,10 @@ data class BuildOptions(
arguments.add("-Pkotlin.compiler.preciseCompilationResultsBackup=$usePreciseOutputsBackup") arguments.add("-Pkotlin.compiler.preciseCompilationResultsBackup=$usePreciseOutputsBackup")
} }
if (keepIncrementalCompilationCachesInMemory != null) {
arguments.add("-Pkotlin.compiler.keepIncrementalCompilationCachesInMemory=$keepIncrementalCompilationCachesInMemory")
}
arguments.addAll(freeArgs) arguments.addAll(freeArgs)
return arguments.toList() return arguments.toList()