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

Enable filesystem watching by default in Gradle tests

Browse Source 
This should reduce flakiness on CI.
This commit is contained in:
Yahor Berdnikau
2022-07-22 10:13:24 +02:00
committed by teamcity
parent cd54afea8f
commit 3c0c477f06
1 changed files with 10 additions and 11 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/testbase/BuildOptions.kt
+10 -11
View File
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.cli.common.CompilerSystemProperties.COMPILE_INCREMEN
import org.jetbrains.kotlin.gradle.BaseGradleIT import org.jetbrains.kotlin.gradle.BaseGradleIT
import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType
import org.jetbrains.kotlin.gradle.report.BuildReportType import org.jetbrains.kotlin.gradle.report.BuildReportType
import org.junit.jupiter.api.condition.OS
import java.util.* import java.util.*
data class BuildOptions( data class BuildOptions(
@@ -26,7 +27,8 @@ data class BuildOptions(
val useGradleClasspathSnapshot: Boolean? = null, val useGradleClasspathSnapshot: Boolean? = null,
val useICClasspathSnapshot: Boolean? = null, val useICClasspathSnapshot: Boolean? = null,
val maxWorkers: Int = (Runtime.getRuntime().availableProcessors() / 4 - 1).coerceAtLeast(2), val maxWorkers: Int = (Runtime.getRuntime().availableProcessors() / 4 - 1).coerceAtLeast(2),
val fileSystemWatchEnabled: Boolean = false, // On Windows OS enabling watch-fs prevents deleting temp directory, which fails the tests
val fileSystemWatchEnabled: Boolean = !OS.WINDOWS.isCurrentOs,
val buildCacheEnabled: Boolean = false, val buildCacheEnabled: Boolean = false,
val kaptOptions: KaptOptions? = null, val kaptOptions: KaptOptions? = null,
val androidVersion: String? = null, val androidVersion: String? = null,
@@ -69,10 +71,9 @@ data class BuildOptions(
WarningMode.None -> arguments.add("--warning-mode=none") WarningMode.None -> arguments.add("--warning-mode=none")
} }
if (gradleVersion >= GradleVersion.version("6.6.0")) { arguments.add("-Dorg.gradle.unsafe.configuration-cache=$configurationCache")
arguments.add("-Dorg.gradle.unsafe.configuration-cache=$configurationCache") arguments.add("-Dorg.gradle.unsafe.configuration-cache-problems=${configurationCacheProblems.name.lowercase(Locale.getDefault())}")
arguments.add("-Dorg.gradle.unsafe.configuration-cache-problems=${configurationCacheProblems.name.lowercase(Locale.getDefault())}")
}
if (gradleVersion >= GradleVersion.version("7.1")) { if (gradleVersion >= GradleVersion.version("7.1")) {
arguments.add("-Dorg.gradle.unsafe.isolated-projects=$projectIsolation") arguments.add("-Dorg.gradle.unsafe.isolated-projects=$projectIsolation")
} }
@@ -90,12 +91,10 @@ data class BuildOptions(
useGradleClasspathSnapshot?.let { arguments.add("-P${COMPILE_INCREMENTAL_WITH_ARTIFACT_TRANSFORM.property}=$it") } useGradleClasspathSnapshot?.let { arguments.add("-P${COMPILE_INCREMENTAL_WITH_ARTIFACT_TRANSFORM.property}=$it") }
useICClasspathSnapshot?.let { arguments.add("-Pkotlin.incremental.classpath.snapshot.enabled=$it") } useICClasspathSnapshot?.let { arguments.add("-Pkotlin.incremental.classpath.snapshot.enabled=$it") }
if (gradleVersion >= GradleVersion.version("6.5")) { if (fileSystemWatchEnabled) {
if (fileSystemWatchEnabled) { arguments.add("--watch-fs")
arguments.add("--watch-fs") } else {
} else { arguments.add("--no-watch-fs")
arguments.add("--no-watch-fs")
}
} }
arguments.add(if (buildCacheEnabled) "--build-cache" else "--no-build-cache") arguments.add(if (buildCacheEnabled) "--build-cache" else "--no-build-cache")