From 8db67ec24b5bebcd93d46ded09d5a562818078f8 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Wed, 7 Apr 2021 17:19:34 +0200 Subject: [PATCH] Add file system watching option to build options. Default build option value - disabled. In Gradle 7 it is enabled by default, and I suspect it causes flaky build failure when 'TempDir' tries to delete test project. ^KT-45744 In Progress --- .../org/jetbrains/kotlin/gradle/testbase/KGPBaseTest.kt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/KGPBaseTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/KGPBaseTest.kt index aedb32e0c44..d5efaa1163d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/KGPBaseTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/KGPBaseTest.kt @@ -45,6 +45,7 @@ abstract class KGPBaseTest { val configurationCacheProblems: BaseGradleIT.ConfigurationCacheProblems = BaseGradleIT.ConfigurationCacheProblems.FAIL, val parallel: Boolean = true, val maxWorkers: Int = (Runtime.getRuntime().availableProcessors() / 4 - 1).coerceAtLeast(2), + val fileSystemWatchEnabled: Boolean = false, ) { fun toArguments( gradleVersion: GradleVersion @@ -76,6 +77,14 @@ abstract class KGPBaseTest { arguments.add("--no-parallel") } + if (gradleVersion >= GradleVersion.version("6.5")) { + if (fileSystemWatchEnabled) { + arguments.add("--watch-fs") + } else { + arguments.add("--no-watch-fs") + } + } + return arguments.toList() } }