azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
#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
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CompilerPluginsIncrementalIT.kt
+1 -1
View File
@@ -71,5 +71,5 @@ open class CompilerPluginsIncrementalIT : KGPBaseTest() {
@DisplayName("Compiler plugin incremental compilation with precise compilation outputs backup")
class CompilerPluginsIncrementalWithPreciseBackupIT : CompilerPluginsIncrementalIT() {
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true)
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true)
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt
+3 -3
View File
@@ -138,7 +138,7 @@ open class IncrementalCompilationJsMultiProjectIT : BaseIncrementalCompilationMu
}
class IncrementalCompilationJsMultiProjectWithPreciseBackupIT : IncrementalCompilationJsMultiProjectIT() {
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true)
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true)
}
@JvmGradlePluginTests
@@ -299,7 +299,7 @@ open class IncrementalCompilationJvmMultiProjectIT : BaseIncrementalCompilationM
}
class IncrementalCompilationJvmMultiProjectWithPreciseBackupIT : IncrementalCompilationJvmMultiProjectIT() {
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true)
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true)
}
class IncrementalCompilationFirJvmMultiProjectIT : IncrementalCompilationJvmMultiProjectIT() {
@@ -440,7 +440,7 @@ open class IncrementalCompilationOldICJvmMultiProjectIT : IncrementalCompilation
}
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() {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalJavaChangeIT.kt
+1 -1
View File
@@ -93,7 +93,7 @@ open class IncrementalJavaChangeDefaultIT : IncrementalCompilationJavaChangesBas
@DisplayName("Default incremental compilation with precise compilation outputs backup")
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")
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt
+1 -1
View File
@@ -391,5 +391,5 @@ open class KaptIncrementalIT : KGPBaseTest() {
@DisplayName("Kapt incremental compilation with precise compilation outputs backup")
class KaptIncrementalWithPreciseBackupIT : KaptIncrementalIT() {
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true)
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true)
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithAggregatingApt.kt
+1 -1
View File
@@ -392,5 +392,5 @@ 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)
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true)
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithIsolatingApt.kt
+1 -1
View File
@@ -431,7 +431,7 @@ 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)
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true)
}
private const val patternApt = "Processing java sources with annotation processors:"
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt3AndroidIncrementalIT.kt
+1 -1
View File
@@ -206,5 +206,5 @@ open class Kapt3AndroidIncrementalIT : Kapt3BaseIT() {
@DisplayName("android with kapt3 incremental build tests with precise compilation outputs backup")
class Kapt3AndroidIncrementalWithPreciseBackupIT : Kapt3AndroidIncrementalIT() {
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true)
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true)
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidIncrementalIT.kt
+1 -1
View File
@@ -180,5 +180,5 @@ open class KotlinAndroidIncrementalIT : KGPBaseTest() {
}
class KotlinAndroidIncrementalWithPreciseBackupIT : KotlinAndroidIncrementalIT() {
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true)
override val defaultBuildOptions = super.defaultBuildOptions.copy(usePreciseOutputsBackup = true, keepIncrementalCompilationCachesInMemory = true)
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/BuildOptions.kt
+5
View File
@@ -40,6 +40,7 @@ data class BuildOptions(
val freeArgs: List<String> = emptyList(),
val statisticsForceValidation: Boolean = true,
val usePreciseOutputsBackup: Boolean? = null,
val keepIncrementalCompilationCachesInMemory: Boolean? = null,
) {
val safeAndroidVersion: String
get() = androidVersion ?: error("AGP version is expected to be set")
@@ -159,6 +160,10 @@ data class BuildOptions(
arguments.add("-Pkotlin.compiler.preciseCompilationResultsBackup=$usePreciseOutputsBackup")
}
if (keepIncrementalCompilationCachesInMemory != null) {
arguments.add("-Pkotlin.compiler.keepIncrementalCompilationCachesInMemory=$keepIncrementalCompilationCachesInMemory")
}
arguments.addAll(freeArgs)
return arguments.toList()