|
Lines 13-18
Link Here
|
| 13 |
import java.io.File; |
13 |
import java.io.File; |
| 14 |
import java.io.IOException; |
14 |
import java.io.IOException; |
| 15 |
import java.net.URL; |
15 |
import java.net.URL; |
|
|
16 |
import java.util.HashMap; |
| 16 |
import java.util.Iterator; |
17 |
import java.util.Iterator; |
| 17 |
import java.util.Map; |
18 |
import java.util.Map; |
| 18 |
import java.util.zip.ZipFile; |
19 |
import java.util.zip.ZipFile; |
|
Lines 24-29
Link Here
|
| 24 |
import org.eclipse.core.tests.session.Setup; |
25 |
import org.eclipse.core.tests.session.Setup; |
| 25 |
import org.eclipse.core.tests.session.SetupManager; |
26 |
import org.eclipse.core.tests.session.SetupManager; |
| 26 |
import org.eclipse.core.tests.session.SetupManager.SetupException; |
27 |
import org.eclipse.core.tests.session.SetupManager.SetupException; |
|
|
28 |
import org.eclipse.jface.util.Util; |
| 29 |
import org.eclipse.osgi.service.environment.Constants; |
| 27 |
import org.eclipse.ui.tests.TestPlugin; |
30 |
import org.eclipse.ui.tests.TestPlugin; |
| 28 |
import org.eclipse.ui.tests.harness.util.FileTool; |
31 |
import org.eclipse.ui.tests.harness.util.FileTool; |
| 29 |
|
32 |
|
|
Lines 98-103
Link Here
|
| 98 |
base.setEclipseArgument(key, value); |
101 |
base.setEclipseArgument(key, value); |
| 99 |
} |
102 |
} |
| 100 |
} |
103 |
} |
|
|
104 |
|
| 105 |
// <== Kludge for the bug 345127. Force spawned VM to be 32 bit |
| 106 |
// if we are in a 32bit Eclipse |
| 107 |
if (Util.isCocoa()) { |
| 108 |
String arch = System.getProperty("osgi.arch"); |
| 109 |
if (Constants.ARCH_X86 == arch) { |
| 110 |
Map vmArguments = new HashMap(1); |
| 111 |
vmArguments.put("d32", null); |
| 112 |
base.setVMArguments(vmArguments); |
| 113 |
} |
| 114 |
} |
| 115 |
// ==> End of kludge for the bug 345127. |
| 101 |
} catch (Exception e) { |
116 |
} catch (Exception e) { |
| 102 |
throw SetupManager.getInstance().new SetupException(e.getMessage(), |
117 |
throw SetupManager.getInstance().new SetupException(e.getMessage(), |
| 103 |
e); |
118 |
e); |
