There are two options supported by Support_Exec: IBM and Sun
I'd like to apply this change (remove "IBM" branch and leave the Sun branch for
all VMs):
Index: C:/WS/Experiments/support/src/test/java/tests/support/Support_Exec.java
===================================================================
--- C:/WS/Experiments/support/src/test/java/tests/support/Support_Exec.java
(revision
442625)
+++ C:/WS/Experiments/support/src/test/java/tests/support/Support_Exec.java
(working
copy)
@@ -68,7 +68,7 @@
if (classpath != null)
for (int i = 0; i < classpath.length; i++)
classPathString += File.pathSeparator +
classpath[i];
- if (vendor.indexOf("Sun") != -1) {
+
baseArgs = 3;
execArgs = new String[baseArgs + args.length];
String executable = System.getProperty("java.home");
@@ -79,35 +79,6 @@
execArgs[1] = "-cp";
execArgs[2] = "\"" +
System.getProperty("java.class.path")
+ classPathString + "\"";
- } else if (vendor.indexOf("IBM") != -1) {
- baseArgs = 5;
- String full = System.getProperty("java.fullversion");
- if (full != null && full.indexOf("(JIT disabled") >= 0)
- baseArgs++;
- execArgs = new String[baseArgs + args.length];
- execArgs[0] = System.getProperty("com.ibm.oti.vm.exe");
- // stop passing -jcl:null into the VM
- // WARNING: empty string in args array may confuse
- // Process.exec(String[] cmdarray) on Linux so
- // Process.exec(String command) is used instead
- execArgs[1] = "";
- if (onUnix) {
- execArgs[2] = "-Xbootclasspath:"
- +
System.getProperty("org.apache.harmony.boot.class.path");
- execArgs[3] = "-cp";
- execArgs[4] =
System.getProperty("java.class.path")
- + classPathString;
- } else {
- execArgs[2] = "\"-Xbootclasspath:"
- +
System.getProperty("org.apache.harmony.boot.class.path")
- + "\"";
- execArgs[3] = "-cp";
- execArgs[4] = "\"" +
System.getProperty("java.class.path")
- + classPathString + "\"";
- }
- if (baseArgs > 5)
- execArgs[5] = "-Xint";
- }
for (int i = 0; i < args.length; i++)
execArgs[baseArgs + i] = args[i];
StringBuffer command = new StringBuffer(execArgs[0]);
Tests pass on WinXP and Linux. Objections?
Thanks,
Mikhail
---------------------------------------------------------------------
Terms of use : http://incubator.apache.org/harmony/mailing.html
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
