db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r178816 - in /incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness: JavaVersionHolder.java RunList.java RunSuite.java
Date Fri, 27 May 2005 19:55:26 GMT
Author: djd
Date: Fri May 27 12:55:25 2005
New Revision: 178816

URL: http://svn.apache.org/viewcvs?rev=178816&view=rev
Log:
Changes to make progress in runnning tests as a suite
with IBM's WCTME 5.7 J2ME/CDC/Foundation 1.0 environment.

Path contributed by Myrna van Lunteren <m.v.lunteren@gmail.com>

Modified:
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java?rev=178816&r1=178815&r2=178816&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java
Fri May 27 12:55:25 2005
@@ -95,7 +95,7 @@
             }
             else
             {
-                System.out.println("NumberFormatException thrown trying to parse the version.");
+                System.out.println("NumberFormatException thrown trying to parse the version.
" + javaVersion);
                 System.out.println("The test harness only handles the HP special case.");
             }
                 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java?rev=178816&r1=178815&r2=178816&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
Fri May 27 12:55:25 2005
@@ -633,7 +633,7 @@
 		jvmName = suiteProperties.getProperty("jvm");
 		String j9config = System.getProperty("com.ibm.oti.configuration");	
 		if (j9config != null)
-			if (j9config.equals("foun")) 
+			if (j9config.equals("foun10")) 
 				jvmName="j9_foundation";
 			else if (j9config.equals("max"))
 				jvmName="j9_13";

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java?rev=178816&r1=178815&r2=178816&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
Fri May 27 12:55:25 2005
@@ -94,7 +94,7 @@
 		}
 		String j9config = System.getProperty("com.ibm.oti.configuration");
 		if (j9config != null) 
-			if (j9config.equals("foun")) 
+			if (j9config.equals("foun10")) 
 				jvmName="j9_foundation";
 			else if (j9config.equals("max"))
 				jvmName="j9_13";
@@ -286,8 +286,15 @@
 		    }
 		    else
 		        javaVersion = jvmName;
+
+            // for j9, we cannot just use java.version.
+            String javavmVersion;
+            if (System.getProperty("java.vm.name").equals("J9"))
+                javavmVersion = (System.getProperty("java.vm.version"));
+            else
+                javavmVersion = javaVersion;
     		    
-		    JavaVersionHolder jvh = new JavaVersionHolder(javaVersion);
+		    JavaVersionHolder jvh = new JavaVersionHolder(javavmVersion);
 		    String majorVersion = jvh.getMajorVersion();
 		    String minorVersion = jvh.getMinorVersion();
             int iminor = jvh.getMinorNumber();



Mime
View raw message