diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle index 38ed1b5d859..fbc65db77f6 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle @@ -84,6 +84,8 @@ tasks.withType(Test) { executable = "${JDK_18}/bin/java" systemProperty("kotlinVersion", kotlinVersion) + systemProperty("runnerGradleVersion", gradle.gradleVersion) + def mavenLocalRepo = System.getProperty("maven.repo.local") if (mavenLocalRepo != null) { systemProperty("maven.repo.local", mavenLocalRepo) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt index 63448dd5178..03ab95258e5 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt @@ -128,7 +128,14 @@ abstract class BaseGradleIT { wrapperProperties.modify { it.replace("", version) } } + private val runnerGradleVersion = System.getProperty("runnerGradleVersion") + private fun stopDaemon(version: String, environmentVariables: Map) { + if (version == runnerGradleVersion) { + println("Not stopping Gradle daemon v$version as it matches the runner version") + return + } + println("Stopping gradle daemon v$version") val wrapperDir = gradleWrappers[version] ?: error("Was asked to stop unknown daemon $version") @@ -146,7 +153,9 @@ abstract class BaseGradleIT { for (version in wrapperVersions) { stopDaemon(version, environmentVariables) } - assert(daemonRunCount.isEmpty()) { "Could not stop some daemons ${daemonRunCount.keys.joinToString()}" } + assert(daemonRunCount.keys.none { it != runnerGradleVersion }) { + "Could not stop some daemons ${(daemonRunCount.keys - runnerGradleVersion).joinToString()}" + } } }