Hi, all:
I have ran the tests of Derby on Harmony, both on windows xp and ubuntu. The result is similar.
On windows,
579 Tests Run
73% Pass (428 tests passed)
27% Fail (151 tests failed)
9 Suites skipped
73% Pass (428 tests passed)
27% Fail (151 tests failed)
9 Suites skipped
On linux,
579 Tests Run
74% Pass (430 tests passed)
26% Fail (149 tests failed)
9 Suites skipped
74% Pass (430 tests passed)
26% Fail (149 tests failed)
9 Suites skipped
The result seems a little frustrating since Sian had 82% passed several months before. The version of derby I ran is at revision 464429. The lost passing rate may be due to the modified code and added testcases.
To Sian: I made a new patch in the attachment which is an updated version of the patch Sian provides. I will be appreciate if Sian helps to check its validity and thus I will be assured that the lost passing rate is irrelevant to our modification.
When I can confirm everything is all right, I will then put the ongoing progress result on Harmony's wiki page.
Thank you.
--
Leo Li
China Software Development Lab, IBM
--
Leo Li
China Software Development Lab, IBM
Index: java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
===================================================================
--- java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
(revision 463544)
+++ java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
(working copy)
@@ -349,7 +349,7 @@
// Build command string for RunTest()
StringBuffer sb = new StringBuffer();
- jvm = jvm.getJvm(jvmName);
+ jvm = jvm.getJvm("jdk15");
Vector jvmProps = new Vector();
if ((javaCmd.length()>0) )
{
@@ -721,7 +721,7 @@
//System.out.println("RunList setTopSuiteProperties
javaVersion: " + javaVersion);
- javaCmd = suiteProperties.getProperty("javaCmd");
+// javaCmd = suiteProperties.getProperty("javaCmd");
if (javaCmd == null)
javaCmd = "java";
else if (javaCmd.equals("jview"))
@@ -729,9 +729,9 @@
// if j9, we need to check further
String javavmVersion;
- if (System.getProperty("java.vm.name").equals("J9"))
- javavmVersion = (System.getProperty("java.vm.version"));
- else
+// if (System.getProperty("java.vm.name").equals("J9"))
+// javavmVersion = (System.getProperty("java.vm.version"));
+// else
javavmVersion = javaVersion;
Index: java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
===================================================================
--- java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
(revision 463544)
+++ java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
(working copy)
@@ -102,7 +102,7 @@
static String searchCP = "";
static boolean useCommonDB = false;
static boolean keepfiles = false;
- static boolean useprocess = true;
+ static boolean useprocess = false;
static boolean systemdiff = false; // can set true if there is a system
diff
static boolean upgradetest = false;
static boolean encryption = false; // requires jdk12ext plus
encryptionProtocol
@@ -983,9 +983,9 @@
//hang on a minute - if j9, we need to check further
String javavmVersion;
- if (sp.getProperty("java.vm.name").equals("J9"))
- javavmVersion = (sp.getProperty("java.vm.version"));
- else
+ //if (sp.getProperty("java.vm.name").equals("J9"))
+ //javavmVersion = (sp.getProperty("java.vm.version"));
+ //else
javavmVersion = javaVersion;
@@ -995,43 +995,44 @@
iminor = jvh.getMinorNumber();
imajor = jvh.getMajorNumber();
- if ( (jvmName == null) || (!jvmName.equals("jview")) )
- {
- if ( (iminor < 2) && (imajor < 2) )
- jvmName = "currentjvm";
- else
- {
- if (System.getProperty("java.vm.vendor").startsWith("IBM"))
- {
- if (System.getProperty("java.vm.name").equals("J9"))
- {
- if
(System.getProperty("com.ibm.oti.configuration").equals("foun10"))
- {
- jvmName = "j9_foundation";
- }
- else
- {
- // for reporting; first extend javaVersion
- javaVersion = javaVersion + " - " + majorVersion +
"." + minorVersion;
- // up to j9 2.1 (jdk 1.3.1 subset) the results are
the same for all versions,
- // or we don't care about it anymore. Switch back
to 1.3. (java.version) values.
- if ((imajor <= 2) && (iminor < 2))
- {
- majorVersion = "1";
- minorVersion = "3";
- imajor = 1;
- iminor = 3;
- }
- jvmName = "j9_" + majorVersion + minorVersion;
- }
- }
- else
- jvmName = "ibm" + majorVersion + minorVersion;
- }
- else
- jvmName = "jdk" + majorVersion + minorVersion;
- }
- }
+// if ( (jvmName == null) || (!jvmName.equals("jview")) )
+// {
+// if ( (iminor < 2) && (imajor < 2) )
+// jvmName = "currentjvm";
+// else
+// {
+// if (System.getProperty("java.vm.vendor").startsWith("IBM"))
+// {
+// if (System.getProperty("java.vm.name").equals("J9"))
+// {
+// if
(System.getProperty("com.ibm.oti.configuration").equals("foun10"))
+// {
+// jvmName = "j9_foundation";
+// }
+// else
+// {
+// // for reporting; first extend javaVersion
+// javaVersion = javaVersion + " - " + majorVersion
+ "." + minorVersion;
+// // up to j9 2.1 (jdk 1.3.1 subset) the results
are the same for all versions,
+// // or we don't care about it anymore. Switch
back to 1.3. (java.version) values.
+// if ((imajor <= 2) && (iminor < 2))
+// {
+// majorVersion = "1";
+// minorVersion = "3";
+// imajor = 1;
+// iminor = 3;
+// }
+// jvmName = "j9_" + majorVersion + minorVersion;
+// }
+// }
+// else
+// jvmName = "ibm" + majorVersion + minorVersion;
+// }
+// else
+// jvmName = "jdk" + majorVersion + minorVersion;
+// }
+// }
+ jvmName = "jdk15";
// create a JavaVersionHolder for the java.specification.version -
// used to control Sed-ing for JDBC4 & up
Index:
java/testing/org/apache/derbyTesting/functionTests/harness/j9_foundation.java
===================================================================
---
java/testing/org/apache/derbyTesting/functionTests/harness/j9_foundation.java
(revision 463544)
+++
java/testing/org/apache/derbyTesting/functionTests/harness/j9_foundation.java
(working copy)
@@ -128,13 +128,9 @@
}
public String getDintro() { return "-D"; }
-// Having the following method overload the one in jvm.java causes problems
when running
-// the junit tests - they *do* successfully run with securityManager.
-// Foundation class tests actually run ok with security manager - except when
useprocess
-// is false. This is caused by a bug in the jvm. See also DERBY-885 and
DERBY-1785.
-// protected void setSecurityProps()
-// {
-// System.out.println("Note: J9 (foundation) tests do not run with
security manager");
-// }
+ protected void setSecurityProps()
+ {
+ System.out.println("Note: J9 (foundation) tests do not run with
security manager");
+ }
}
Index: java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
===================================================================
--- java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
(revision 463544)
+++ java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
(working copy)
@@ -90,11 +90,11 @@
public static void main(String[] args) throws Exception
{
- if ((System.getProperty("java.vm.name") != null) &&
System.getProperty("java.vm.name").equals("J9"))
- {
- javaCmd = "j9";
- String javaHome =
System.getProperty("java.home");
- }
+// if ((System.getProperty("java.vm.name") != null) &&
System.getProperty("java.vm.name").equals("J9"))
+// {
+// javaCmd = "j9";
+// String javaHome =
System.getProperty("java.home");
+// }
String j9config =
System.getProperty("com.ibm.oti.configuration");
if (j9config != null)
if (j9config.equals("foun10"))
@@ -309,7 +309,7 @@
jvmName = "jdk" + majorVersion + minorVersion;
if ( tmpjvmName != null)
jvmName= tmpjvmName;
- javaCmd = p.getProperty("javaCmd");
+ //javaCmd = p.getProperty("javaCmd");
jvmflags = p.getProperty("jvmflags");
testJavaFlags = p.getProperty("testJavaFlags");
testSpecialProps = p.getProperty("testSpecialProps");
@@ -377,11 +377,11 @@
suiteProperties.put("jversion", j);
String jcmd = sp.getProperty("javaCmd");
- if ((System.getProperty("java.vm.name") != null) &&
System.getProperty("java.vm.name").equals("J9"))
- jcmd = "j9";
+// if ((System.getProperty("java.vm.name") != null) &&
System.getProperty("java.vm.name").equals("J9"))
+// jcmd = "j9";
if (jcmd != null)
{
- javaCmd = jcmd;
+ //javaCmd = jcmd;
suiteProperties.put("javaCmd", javaCmd);
}
// get System properties for jvmflags, and put them to the end,
thus
--------------------------------------------------------------------- Terms of use : http://incubator.apache.org/harmony/mailing.html To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
