From da25d58fa73c445fecf53210452dc1a8dca89be8 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Fri, 11 Jun 2021 10:54:33 +0200 Subject: [PATCH] Control cache redirector status in test via project settings. Test will use project `gradle.properties` file to get current cache redirector status, so it could be controlled from one place. ^KT-47185 Fixed --- .../org/jetbrains/kotlin/gradle/testbase/testDsl.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt index 7e25b22f58c..ce5ce645e00 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt @@ -215,12 +215,18 @@ internal fun Path.enableCacheRedirector() { val gradleDir = resolve("gradle").also { it.createDirectories() } redirectorScript.copyTo(gradleDir.resolve("cacheRedirector.gradle.kts")) + val projectCacheRedirectorStatus = Paths + .get("../../../gradle.properties") + .readText() + .lineSequence() + .first { it.startsWith("cacheRedirectorEnabled") } + resolve("gradle.properties") .also { if (!it.exists()) it.createFile() } .appendText( """ - cacheRedirectorEnabled=true + $projectCacheRedirectorStatus """.trimIndent() )