### Eclipse Workspace Patch 1.0 #P org.eclipse.ui.tests Index: Eclipse UI Tests/org/eclipse/ui/tests/session/WorkbenchSessionTest.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/WorkbenchSessionTest.java,v retrieving revision 1.9 diff -u -r1.9 WorkbenchSessionTest.java --- Eclipse UI Tests/org/eclipse/ui/tests/session/WorkbenchSessionTest.java 14 Apr 2011 19:07:37 -0000 1.9 +++ Eclipse UI Tests/org/eclipse/ui/tests/session/WorkbenchSessionTest.java 19 May 2011 19:42:19 -0000 @@ -13,6 +13,7 @@ import java.io.File; import java.io.IOException; import java.net.URL; +import java.util.HashMap; import java.util.Iterator; import java.util.Map; import java.util.zip.ZipFile; @@ -24,6 +25,8 @@ import org.eclipse.core.tests.session.Setup; import org.eclipse.core.tests.session.SetupManager; import org.eclipse.core.tests.session.SetupManager.SetupException; +import org.eclipse.jface.util.Util; +import org.eclipse.osgi.service.environment.Constants; import org.eclipse.ui.tests.TestPlugin; import org.eclipse.ui.tests.harness.util.FileTool; @@ -98,6 +101,18 @@ base.setEclipseArgument(key, value); } } + + // <== Kludge for the bug 345127. Force spawned VM to be 32 bit + // if we are in a 32bit Eclipse + if (Util.isCocoa()) { + String arch = System.getProperty("osgi.arch"); + if (Constants.ARCH_X86 == arch) { + Map vmArguments = new HashMap(1); + vmArguments.put("d32", null); + base.setVMArguments(vmArguments); + } + } + // ==> End of kludge for the bug 345127. } catch (Exception e) { throw SetupManager.getInstance().new SetupException(e.getMessage(), e);