Skip to content

Disable DetectVMInstallationsJob for JUnit Plug-in Test launches #2216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
trancexpress wants to merge 1 commit into from
Closed

Disable DetectVMInstallationsJob for JUnit Plug-in Test launches #2216

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/JUnitWorkbenchLaunchShortcut.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
*/
public class JUnitWorkbenchLaunchShortcut extends JUnitLaunchShortcut {

private static final String DETECT_VM_INSTALLATIONS_DISABLED = "-DDetectVMInstallationsJob.disabled"; //$NON-NLS-1$

@Override
protected String getLaunchConfigurationTypeId() {
return "org.eclipse.pde.ui.JunitLaunchConfig"; //$NON-NLS-1$
Expand Down Expand Up @@ -112,9 +114,13 @@ protected ILaunchConfigurationWorkingCopy createLaunchConfiguration(IJavaElement

// VM arguments
String vmArgs = LaunchArgumentsHelper.getInitialVMArguments();
if (vmArgs.length() > 0) {
configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, vmArgs);
if (!vmArgs.contains(DETECT_VM_INSTALLATIONS_DISABLED)) {
if (!vmArgs.isEmpty()) {
vmArgs += " "; //$NON-NLS-1$
}
vmArgs += DETECT_VM_INSTALLATIONS_DISABLED + "=true"; //$NON-NLS-1$
}
configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, vmArgs);
configuration.setAttribute(IPDELauncherConstants.BOOTSTRAP_ENTRIES, ""); //$NON-NLS-1$

// configuration attributes
Expand Down
Loading