Skip to content

Commit 4d59605

Browse files
committed
Equinox Framework is required for plugin-test launches
Currently with the new feature to only include what is minimally required this can lead to the strange situation that the test fails to startup, if one then adds the org.eclipse.osgi to the bundle list it works without a problem. This now adds the "org.eclipse.osgi" as a requirement for plugin-test launches as it is mandatory anyways.
1 parent b5a1589 commit 4d59605

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

ui/org.eclipse.pde.launching/src/org/eclipse/pde/launching/JUnitLaunchConfigurationDelegate.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
import org.eclipse.pde.core.plugin.IPluginModelBase;
6868
import org.eclipse.pde.core.plugin.PluginRegistry;
6969
import org.eclipse.pde.core.plugin.TargetPlatform;
70+
import org.eclipse.pde.internal.build.IPDEBuildConstants;
7071
import org.eclipse.pde.internal.core.ClasspathHelper;
7172
import org.eclipse.pde.internal.core.DependencyManager;
7273
import org.eclipse.pde.internal.core.ICoreConstants;
@@ -109,9 +110,12 @@ public class JUnitLaunchConfigurationDelegate extends org.eclipse.jdt.junit.laun
109110
application = TargetPlatform.getDefaultApplication();
110111
}
111112
if (!IPDEConstants.CORE_TEST_APPLICATION.equals(application)) {
112-
return RequirementHelper.getApplicationRequirements(application);
113+
List<String> applicationRequirements = RequirementHelper.getApplicationRequirements(application);
114+
List<String> list = new ArrayList<>(applicationRequirements);
115+
list.add(IPDEBuildConstants.BUNDLE_OSGI);
116+
return list;
113117
}
114-
return Collections.emptyList();
118+
return List.of(IPDEBuildConstants.BUNDLE_OSGI);
115119
});
116120
}
117121

0 commit comments

Comments
 (0)