MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-107959 Can't debug unit tests (test task) from Gradle

Browse Source
This commit is contained in:
Vladislav.Soroka
2013-08-19 11:26:25 +04:00
parent 3685045f54
commit b1af03fe3b
3 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java
+1 -1
View File
@@ -148,7 +148,7 @@ public class ExternalSystemRunConfiguration extends LocatableConfigurationBase {
}
String vmOptions;
if (myDebugPort > 0) {
String debuggerSetup = "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=" + myDebugPort;
String debuggerSetup = "-agentlib:jdwp=transport=dt_socket,server=n,suspend=y,address=" + myDebugPort;
String regular = mySettings.getVmOptions();
vmOptions = regular == null ? debuggerSetup : regular + " " + debuggerSetup;
}
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemTaskDebugRunner.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class ExternalSystemTaskDebugRunner extends GenericDebuggerRunner {
if (state instanceof ExternalSystemRunConfiguration.MyRunnableState) {
int port = ((ExternalSystemRunConfiguration.MyRunnableState)state).getDebugPort();
if (port > 0) {
RemoteConnection connection = new RemoteConnection(true, "127.0.0.1", String.valueOf(port), false);
RemoteConnection connection = new RemoteConnection(true, "127.0.0.1", String.valueOf(port), true);
return attachVirtualMachine(project, state, contentToReuse, env, connection, true);
}
else {
plugins/gradle/src/org/jetbrains/plugins/gradle/service/task/GradleTaskManager.java
+23 -7
View File
@@ -15,13 +15,15 @@
*/
package org.jetbrains.plugins.gradle.service.task;
import com.intellij.openapi.externalSystem.task.ExternalSystemTaskManager;
import com.intellij.openapi.externalSystem.model.ExternalSystemException;
import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskId;
import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskNotificationListener;
import com.intellij.openapi.externalSystem.task.ExternalSystemTaskManager;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Function;
import com.intellij.util.SystemProperties;
import org.gradle.tooling.BuildLauncher;
import org.gradle.tooling.ProjectConnection;
import org.jetbrains.annotations.NotNull;
@@ -29,6 +31,8 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.gradle.service.project.GradleExecutionHelper;
import org.jetbrains.plugins.gradle.settings.GradleExecutionSettings;
import java.io.File;
import java.io.IOException;
import java.util.List;
/**
@@ -36,7 +40,7 @@ import java.util.List;
* @since 3/14/13 5:09 PM
*/
public class GradleTaskManager implements ExternalSystemTaskManager<GradleExecutionSettings> {
private final GradleExecutionHelper myHelper = new GradleExecutionHelper();
@Override
@@ -45,21 +49,33 @@ public class GradleTaskManager implements ExternalSystemTaskManager<GradleExecut
@NotNull String projectPath,
@Nullable final GradleExecutionSettings settings,
@Nullable final String vmOptions,
@NotNull final ExternalSystemTaskNotificationListener listener) throws ExternalSystemException
{
@NotNull final ExternalSystemTaskNotificationListener listener) throws ExternalSystemException {
Function<ProjectConnection, Void> f = new Function<ProjectConnection, Void>() {
@Override
public Void fun(ProjectConnection connection) {
BuildLauncher launcher = myHelper.getBuildLauncher(id, connection, settings, listener);
if (!StringUtil.isEmpty(vmOptions)) {
assert vmOptions != null;
launcher.setJvmArguments(vmOptions.trim());
try {
final File tempFile = FileUtil.createTempFile("init", ".gradle");
tempFile.deleteOnExit();
final String[] lines = {
"gradle.taskGraph.beforeTask { Task task ->",
" if (task instanceof JavaForkOptions) {",
" task.jvmArgs '" + vmOptions.trim() + '\'',
"}}",
};
FileUtil.writeToFile(tempFile, StringUtil.join(lines, SystemProperties.getLineSeparator()));
launcher.withArguments("--init-script", tempFile.getAbsolutePath());
}
catch (IOException e) {
throw new ExternalSystemException(e);
}
}
launcher.forTasks(ArrayUtil.toStringArray(taskNames));
launcher.run();
return null;
}
};
myHelper.execute(projectPath, settings, f);
myHelper.execute(projectPath, settings, f);
}
}