From cf39803074aa9e99bc89fae5aa9b89d73c080a97 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Tue, 27 Aug 2019 19:02:54 +0300 Subject: [PATCH] Pass cacheRedirectorEnabled flag to performance test gradle import #KT-33582 --- idea/build.gradle.kts | 3 +++ .../kotlin/idea/perf/AbstractPerformanceProjectsTest.kt | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index 74848e815b8..0faa78d08a5 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -215,6 +215,9 @@ projectTest(taskName = "performanceTest") { doFirst { systemProperty("idea.home.path", intellijRootDir().canonicalPath) + project.findProperty("cacheRedirectorEnabled")?.let { + systemProperty("kotlin.test.gradle.import.arguments", "-PcacheRedirectorEnabled=$it") + } } } diff --git a/idea/performanceTests/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt b/idea/performanceTests/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt index e921f73cdb8..e2f647b0a42 100644 --- a/idea/performanceTests/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt +++ b/idea/performanceTests/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt @@ -285,11 +285,15 @@ abstract class AbstractPerformanceProjectsTest : UsefulTestCase() { GradleProjectOpenProcessor.openGradleProject(project, null, Paths.get(projectPath)) + val gradleArguments = System.getProperty("kotlin.test.gradle.import.arguments") ExternalSystemUtil.refreshProjects( ImportSpecBuilder(project, GradleConstants.SYSTEM_ID) .forceWhenUptodate() .useDefaultCallback() .use(ProgressExecutionMode.MODAL_SYNC) + .also { + gradleArguments?.run(it::withArguments) + } ) dispatchAllInvocationEvents()