Tests: reinstate the workaround for Bug 413850 - Mysterious
ClassCircularityError against classes MacVMLauncher and
StandardVMLauncher
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/runtime/LocalVMLauncher.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/runtime/LocalVMLauncher.java
index e3de69a..6f5fa63 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/runtime/LocalVMLauncher.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/runtime/LocalVMLauncher.java
@@ -60,10 +60,12 @@
if (vmName != null && vmName.indexOf("JRockit") != -1) {
return new JRockitVMLauncher();
}
- final String osName = System.getProperty("os.name");
- if (osName.startsWith("Mac")) {
- return new MacVMLauncher();
- }
+//{ObjectTeams: see https://bugs.eclipse.org/bugs/show_bug.cgi?id=413850
+// final String osName = System.getProperty("os.name");
+// if (osName.startsWith("Mac")) {
+// return new MacVMLauncher();
+// }
+// SH}
File file = new File(Util.getJREDirectory() + "/lib/rt.jar");
if (file.exists()) {
return new StandardVMLauncher();