From 8440c5722f7398fe5b4517f2ceaee6579095a22e Mon Sep 17 00:00:00 2001 From: Alexander Likhachev Date: Tue, 6 Apr 2021 15:59:30 +0300 Subject: [PATCH] [Gradle] Read property idea.active in tests registry via Gradle provider --- .../gradle/testing/internal/KotlinTestsRegistry.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/KotlinTestsRegistry.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/KotlinTestsRegistry.kt index 933b0a6dca8..09c40c2f966 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/KotlinTestsRegistry.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/KotlinTestsRegistry.kt @@ -14,6 +14,7 @@ import org.gradle.language.base.plugins.LifecycleBasePlugin import org.jetbrains.kotlin.gradle.tasks.dependsOn import org.jetbrains.kotlin.gradle.tasks.registerTask import org.jetbrains.kotlin.gradle.tasks.locateTask +import org.jetbrains.kotlin.gradle.utils.isConfigurationCacheAvailable /** * Internal service for creating aggregated test tasks and registering all test tasks. @@ -71,7 +72,13 @@ class KotlinTestsRegistry(val project: Project, val allTestsTaskName: String = " aggregate.destinationDir = project.testReportsDir.resolve(reportName) - if (System.getProperty("idea.active") != null) { + val isIdeaActive = if (isConfigurationCacheAvailable(project.gradle)) { + project.providers.systemProperty("idea.active").forUseAtConfigurationTime().isPresent + } else { + System.getProperty("idea.active") != null + } + + if (isIdeaActive) { aggregate.extensions.extraProperties.set("idea.internal.test", true) }