From 12bcb60e50c4e4de3715032ffa9620e02345f540 Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Tue, 30 Sep 2014 20:06:41 +0400 Subject: [PATCH] gradle: do not spawn gradle daemons during test execution --- .../gradle/service/project/GradleExecutionHelper.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleExecutionHelper.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleExecutionHelper.java index c31f7ba01c0a..cc5e5c52c38b 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleExecutionHelper.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleExecutionHelper.java @@ -16,6 +16,8 @@ package org.jetbrains.plugins.gradle.service.project; import com.intellij.execution.configurations.CommandLineTokenizer; +import com.intellij.openapi.application.Application; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.externalSystem.model.ExternalSystemException; import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskId; @@ -349,6 +351,11 @@ public class GradleExecutionHelper { } if (ttl > 0 && connector instanceof DefaultGradleConnector) { + + // do not spawn gradle daemons during test execution + final Application app = ApplicationManager.getApplication(); + ttl = (app != null && app.isUnitTestMode()) ? 10000 : ttl; + ((DefaultGradleConnector)connector).daemonMaxIdleTime(ttl, TimeUnit.MILLISECONDS); } connector.forProjectDirectory(projectDir);