From 9f89e7f94f5c621f1171fcf81b87a608a9ae08b6 Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Fri, 20 Oct 2023 05:28:58 +0200 Subject: [PATCH] [Gradle] Flip the IC backup optimizations flags in the tests ^KT-62758 Fixed --- .../gradle/CompilerPluginsIncrementalIT.kt | 10 +++---- .../IncrementalCompilationMultiProjectIT.kt | 27 ++++++++++--------- .../kotlin/gradle/IncrementalJavaChangeIT.kt | 10 +++---- .../kotlin/gradle/KaptIncrementalIT.kt | 6 ++--- .../KaptIncrementalWithAggregatingApt.kt | 6 ++--- .../gradle/KaptIncrementalWithIsolatingApt.kt | 6 ++--- .../android/Kapt3AndroidIncrementalIT.kt | 6 ++--- .../android/Kapt4AndroidIncrementalIT.kt | 2 +- .../android/KotlinAndroidIncrementalIT.kt | 5 ++-- 9 files changed, 41 insertions(+), 37 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CompilerPluginsIncrementalIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CompilerPluginsIncrementalIT.kt index 182d4e55983..ebf9bfe6b3c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CompilerPluginsIncrementalIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CompilerPluginsIncrementalIT.kt @@ -83,17 +83,17 @@ class CompilerPluginsK2IncrementalIT : CompilerPluginsIncrementalIT() { } } -@DisplayName("Compiler plugin incremental compilation with precise compilation outputs backup") -abstract class CompilerPluginsIncrementalWithPreciseBackupIT : CompilerPluginsIncrementalIT() { - override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true) +@DisplayName("Compiler plugin incremental compilation with disabled precise compilation outputs backup") +abstract class CompilerPluginsIncrementalWithoutPreciseBackupIT : CompilerPluginsIncrementalIT() { + override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = false, keepIncrementalCompilationCachesInMemory = false) } @DisplayName("Compiler plugin incremental compilation with precise compilation outputs backup") -class CompilerPluginsK1IncrementalWithPreciseBackupIT : CompilerPluginsIncrementalWithPreciseBackupIT() { +class CompilerPluginsK1IncrementalWithoutPreciseBackupIT : CompilerPluginsIncrementalWithoutPreciseBackupIT() { override val defaultBuildOptions = super.defaultBuildOptions.copyEnsuringK1() } -class CompilerPluginsK2IncrementalWithPreciseBackupIT : CompilerPluginsIncrementalWithPreciseBackupIT() { +class CompilerPluginsK2IncrementalWithoutPreciseBackupIT : CompilerPluginsIncrementalWithoutPreciseBackupIT() { override val defaultBuildOptions = super.defaultBuildOptions.copyEnsuringK2() @Disabled("KT-61171") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt index 0aee700ce3e..afbcc280db6 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt @@ -151,8 +151,9 @@ abstract class IncrementalCompilationJsMultiProjectIT : BaseIncrementalCompilati } } -abstract class IncrementalCompilationJsMultiProjectWithPreciseBackupIT : IncrementalCompilationJsMultiProjectIT() { - override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true) +@DisplayName("K/JS multi-project IC with disabled precise outputs backups") +abstract class IncrementalCompilationJsMultiProjectWithoutPreciseBackupIT : IncrementalCompilationJsMultiProjectIT() { + override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = false, keepIncrementalCompilationCachesInMemory = false) } class IncrementalCompilationK1JsMultiProject : IncrementalCompilationJsMultiProjectIT() { @@ -168,11 +169,11 @@ class IncrementalCompilationK2JsMultiProject : IncrementalCompilationJsMultiProj } } -class IncrementalCompilationK1JsMultiProjectWithPreciseBackupIT : IncrementalCompilationJsMultiProjectWithPreciseBackupIT() { +class IncrementalCompilationK1JsMultiProjectWithoutPreciseBackupIT : IncrementalCompilationJsMultiProjectWithoutPreciseBackupIT() { override val defaultBuildOptions = super.defaultBuildOptions.copyEnsuringK1() } -class IncrementalCompilationK2JsMultiProjectWithPreciseBackupIT : IncrementalCompilationJsMultiProjectWithPreciseBackupIT() { +class IncrementalCompilationK2JsMultiProjectWithoutPreciseBackupIT : IncrementalCompilationJsMultiProjectWithoutPreciseBackupIT() { override val defaultBuildOptions = super.defaultBuildOptions.copyEnsuringK2() } @@ -334,11 +335,12 @@ abstract class IncrementalCompilationJvmMultiProjectIT : BaseIncrementalCompilat } } -abstract class IncrementalCompilationJvmMultiProjectWithPreciseBackupIT : IncrementalCompilationJvmMultiProjectIT() { - override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true) +@DisplayName("K/JVM multi-project IC with disabled precise outputs backups") +abstract class IncrementalCompilationJvmMultiProjectWithoutPreciseBackupIT : IncrementalCompilationJvmMultiProjectIT() { + override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = false, keepIncrementalCompilationCachesInMemory = false) } -class IncrementalCompilationK2JvmMultiProjectBuildToolsApiDaemonIT : IncrementalCompilationJvmMultiProjectWithPreciseBackupIT() { +class IncrementalCompilationK2JvmMultiProjectBuildToolsApiDaemonIT : IncrementalCompilationJvmMultiProjectWithoutPreciseBackupIT() { override val defaultBuildOptions = super.defaultBuildOptions.copy(runViaBuildToolsApi = true, compilerExecutionStrategy = KotlinCompilerExecutionStrategy.DAEMON) @Disabled("Doesn't make sense since Build Tools API supports incremental compilation for the in-process mode") @@ -346,7 +348,7 @@ class IncrementalCompilationK2JvmMultiProjectBuildToolsApiDaemonIT : Incremental } } -class IncrementalCompilationK2JvmMultiProjectBuildToolsApiInProcessIT : IncrementalCompilationJvmMultiProjectWithPreciseBackupIT() { +class IncrementalCompilationK2JvmMultiProjectBuildToolsApiInProcessIT : IncrementalCompilationJvmMultiProjectWithoutPreciseBackupIT() { override val defaultBuildOptions = super.defaultBuildOptions.copy(runViaBuildToolsApi = true, compilerExecutionStrategy = KotlinCompilerExecutionStrategy.IN_PROCESS) @Disabled("Doesn't make sense since Build Tools API supports incremental compilation for the in-process mode") @@ -354,11 +356,11 @@ class IncrementalCompilationK2JvmMultiProjectBuildToolsApiInProcessIT : Incremen } } -class IncrementalCompilationK1JvmMultiProjectWithPreciseBackupIT : IncrementalCompilationJvmMultiProjectWithPreciseBackupIT() { +class IncrementalCompilationK1JvmMultiProjectWithoutPreciseBackupIT : IncrementalCompilationJvmMultiProjectWithoutPreciseBackupIT() { override val defaultBuildOptions = super.defaultBuildOptions.copyEnsuringK1() } -class IncrementalCompilationK2JvmMultiProjectWithPreciseBackupIT : IncrementalCompilationJvmMultiProjectWithPreciseBackupIT() { +class IncrementalCompilationK2JvmMultiProjectWithoutPreciseBackupIT : IncrementalCompilationJvmMultiProjectWithoutPreciseBackupIT() { override val defaultBuildOptions = super.defaultBuildOptions.copyEnsuringK2() } @@ -516,8 +518,9 @@ open class IncrementalCompilationOldICJvmMultiProjectIT : IncrementalCompilation } } -class IncrementalCompilationOldICJvmMultiProjectWithPreciseBackupIT : IncrementalCompilationOldICJvmMultiProjectIT() { - override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true) +@DisplayName("K/JVM multi-project IC with disabled precise outputs backups and disabled classpath snapshots") +class IncrementalCompilationOldICJvmMultiProjectWithoutPreciseBackupIT : IncrementalCompilationOldICJvmMultiProjectIT() { + override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = false, keepIncrementalCompilationCachesInMemory = false) } abstract class BaseIncrementalCompilationMultiProjectIT : IncrementalCompilationBaseIT() { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalJavaChangeIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalJavaChangeIT.kt index 75584295650..054a00c754b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalJavaChangeIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalJavaChangeIT.kt @@ -173,18 +173,18 @@ class IncrementalK2JavaChangeBuildToolsApiInProcessIT : IncrementalJavaChangeDef } } -@DisplayName("Default incremental compilation with precise compilation outputs backup") -abstract class IncrementalJavaChangePreciseCompilationBackupIT : IncrementalJavaChangeDefaultIT() { - override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true) +@DisplayName("Default incremental compilation with disabled precise compilation outputs backup") +abstract class IncrementalJavaChangeWithoutPreciseCompilationBackupIT : IncrementalJavaChangeDefaultIT() { + override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = false, keepIncrementalCompilationCachesInMemory = false) } @DisplayName("Default incremental compilation with precise compilation outputs backup on K1") -class IncrementalK1JavaChangePreciseCompilationBackupIT : IncrementalJavaChangePreciseCompilationBackupIT() { +class IncrementalK1JavaChangeWithoutPreciseCompilationBackupIT : IncrementalJavaChangeWithoutPreciseCompilationBackupIT() { override val defaultBuildOptions = super.defaultBuildOptions.copyEnsuringK1() } @DisplayName("Default incremental compilation with precise compilation outputs backup on K2") -class IncrementalK2JavaChangePreciseCompilationBackupIT : IncrementalJavaChangePreciseCompilationBackupIT() { +class IncrementalK2JavaChangeWithoutPreciseCompilationBackupIT : IncrementalJavaChangeWithoutPreciseCompilationBackupIT() { override val defaultBuildOptions = super.defaultBuildOptions.copyEnsuringK2() @Disabled("KT-57147") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt index 8050ef11b06..9d3decf159c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt @@ -392,7 +392,7 @@ open class KaptIncrementalIT : KGPBaseTest() { val TestProject.kaptGeneratedToPath get() = projectPath.resolve("build/generated/source/kapt") } -@DisplayName("Kapt incremental compilation with precise compilation outputs backup") -class KaptIncrementalWithPreciseBackupIT : KaptIncrementalIT() { - override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true) +@DisplayName("Kapt incremental compilation with disabled precise compilation outputs backup") +class KaptIncrementalWithoutPreciseBackupIT : KaptIncrementalIT() { + override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = false, keepIncrementalCompilationCachesInMemory = false) } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithAggregatingApt.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithAggregatingApt.kt index 0f26739d469..9589ba48a14 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithAggregatingApt.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithAggregatingApt.kt @@ -393,7 +393,7 @@ open class KaptIncrementalWithAggregatingApt : KaptIncrementalIT() { } -@DisplayName("Kapt incremental tests with aggregating apt with precise compilation outputs backup") -class KaptIncrementalWithAggregatingAptAndPreciseBackup : KaptIncrementalWithAggregatingApt() { - override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true) +@DisplayName("Kapt incremental tests with aggregating apt with disabled precise compilation outputs backup") +class KaptIncrementalWithAggregatingAptAndWithoutPreciseBackup : KaptIncrementalWithAggregatingApt() { + override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = false, keepIncrementalCompilationCachesInMemory = false) } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithIsolatingApt.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithIsolatingApt.kt index 5136ba7235e..d33e6483f1c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithIsolatingApt.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithIsolatingApt.kt @@ -439,9 +439,9 @@ open class KaptIncrementalWithIsolatingApt : KaptIncrementalIT() { } } -@DisplayName("Kapt incremental tests with isolating apt with precise compilation outputs backup") -class KaptIncrementalWithIsolatingAptAndPreciseBackup : KaptIncrementalWithIsolatingApt() { - override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true) +@DisplayName("Kapt incremental tests with isolating apt with disabled precise compilation outputs backup") +class KaptIncrementalWithIsolatingAptAndWithoutPreciseBackup : KaptIncrementalWithIsolatingApt() { + override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = false, keepIncrementalCompilationCachesInMemory = false) } private const val patternApt = "Processing java sources with annotation processors:" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt3AndroidIncrementalIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt3AndroidIncrementalIT.kt index 7f0bcdbe7f0..e15d429a194 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt3AndroidIncrementalIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt3AndroidIncrementalIT.kt @@ -204,7 +204,7 @@ open class Kapt3AndroidIncrementalIT : Kapt3BaseIT() { } } -@DisplayName("android with kapt3 incremental build tests with precise compilation outputs backup") -open class Kapt3AndroidIncrementalWithPreciseBackupIT : Kapt3AndroidIncrementalIT() { - override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true) +@DisplayName("android with kapt3 incremental build tests with disabled precise compilation outputs backup") +open class Kapt3AndroidIncrementalWithoutPreciseBackupIT : Kapt3AndroidIncrementalIT() { + override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = false, keepIncrementalCompilationCachesInMemory = false) } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt4AndroidIncrementalIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt4AndroidIncrementalIT.kt index 1d0896e13bc..07275bf1c1a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt4AndroidIncrementalIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt4AndroidIncrementalIT.kt @@ -19,7 +19,7 @@ class Kapt4AndroidIncrementalIT : Kapt3AndroidIncrementalIT() { } @DisplayName("android with kapt4 incremental build tests with precise compilation outputs backup") -class Kapt4AndroidIncrementalWithPreciseBackupIT : Kapt3AndroidIncrementalWithPreciseBackupIT() { +class Kapt4AndroidIncrementalWithoutPreciseBackupIT : Kapt3AndroidIncrementalWithoutPreciseBackupIT() { override val defaultBuildOptions = super.defaultBuildOptions.copyEnsuringK2() override fun TestProject.customizeProject() { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidIncrementalIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidIncrementalIT.kt index a319ba4e859..75856b04ddb 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidIncrementalIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidIncrementalIT.kt @@ -180,8 +180,9 @@ open class KotlinAndroidIncrementalIT : KGPBaseTest() { } } -class KotlinAndroidIncrementalWithPreciseBackupIT : KotlinAndroidIncrementalIT() { - override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true) +@DisplayName("Android incremental compilation with disabled precise compilation outputs backup") +class KotlinAndroidIncrementalWithoutPreciseBackupIT : KotlinAndroidIncrementalIT() { + override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = false, keepIncrementalCompilationCachesInMemory = false) } class KotlinAndroidIncrementalBuildToolsApiDaemonIT : KotlinAndroidIncrementalIT() {