db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r738671 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: harness/FileCompare.java harness/RunList.java harness/RunSuite.java harness/RunTest.java harness/j9dee15.java suites/encryptionOFB.properties
Date Wed, 28 Jan 2009 23:29:24 GMT
Author: myrnavl
Date: Wed Jan 28 23:29:24 2009
New Revision: 738671

URL: http://svn.apache.org/viewvc?rev=738671&view=rev
Log:
DERBY-3972; committing patch part1.diff2 for initial support in test harness
  for ibm's desktopEE jvm

Added:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9dee15.java
  (with props)
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/FileCompare.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionOFB.properties

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/FileCompare.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/FileCompare.java?rev=738671&r1=738670&r2=738671&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/FileCompare.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/FileCompare.java
Wed Jan 28 23:29:24 2009
@@ -384,11 +384,12 @@
 	// first search jvmName (to support unnamed/non-IBM or Sun JVMs)
 	// if vendor == IBM, search ibm+rev then jdk+rev, decrementing rev by one until rev=13,
 	// in each dir, search framework and driver version if applicable.
-	// BUT, if it's j9, first j9_foundation, then search j9_22 for 22, otherwise, j9_13 then
+	// BUT, if it's j9, unless j9dee, first j9_foundation, then search j9_22 for 22, otherwise,
j9_13 then
 	// the normal ibm13 search pattern: ibm13 then jdk13.
 
 	String newprefix;
-	if (jvmName.startsWith("j9") || (serverJvm != null && serverJvm.startsWith("j9")))
+	if ((jvmName.startsWith("j9") || (serverJvm != null && serverJvm.startsWith("j9")))
+            && (!jvmName.startsWith("j9dee")))
 	{
 	    if (jvmName.startsWith("j9_foundation"))
             {

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java?rev=738671&r1=738670&r2=738671&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
Wed Jan 28 23:29:24 2009
@@ -716,6 +716,9 @@
 				jvmName="j9_foundation11";
 			else if (j9config.equals("max"))
 				jvmName="j9_13";
+			else if (j9config.equals("dee"))
+				jvmName="j9dee15";
+
 		if (jversion == null)
 		    javaVersion = System.getProperty("java.version");
 		else

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java?rev=738671&r1=738670&r2=738671&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
Wed Jan 28 23:29:24 2009
@@ -103,6 +103,8 @@
 				jvmName="j9_foundation11";
 			else if (j9config.equals("max"))
 				jvmName="j9_13";
+			else if (j9config.equals("dee"))
+				jvmName="j9dee15";
 
 	    String suiteName = args[0];
 	    if ( suiteName == null )

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java?rev=738671&r1=738670&r2=738671&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
Wed Jan 28 23:29:24 2009
@@ -1014,6 +1014,10 @@
                         {
                             jvmName = "j9_foundation11";
                         }
+                        else if (System.getProperty("com.ibm.oti.configuration").equals("dee"))
+                        {
+                            jvmName = "j9dee15";
+                        }
                         else
                         {
                             // for reporting; first extend javaVersion
@@ -1369,7 +1373,7 @@
 
         // j9 will run out of memory with the default cache size (100), so
         // forcing it lower unless set in _derby.properties file for a specific test
-        if (jvmName.startsWith("j9"))
+        if (jvmName.startsWith("j9") && (!jvmName.equalsIgnoreCase("j9dee15")))
         {
             if (clp.getProperty("derby.language.statementCacheSize")==null)
                 clp.put("derby.language.statementCacheSize", J9_STATEMENTCACHESIZE);
@@ -1712,6 +1716,8 @@
             		testJVM = "foundation";
             	else if (jvmName.equals("j9_foundation11"))
             		testJVM = "foundation";
+                else if (jvmName.equalsIgnoreCase("j9dee15"))
+                    testJVM = "j9dee15";
             	else
             		testJVM = "j9";
             }

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9dee15.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9dee15.java?rev=738671&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9dee15.java
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9dee15.java
Wed Jan 28 23:29:24 2009
@@ -0,0 +1,117 @@
+/*
+
+   Derby - Class org.apache.derbyTesting.functionTests.harness.j9dee15
+
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+ */
+
+package org.apache.derbyTesting.functionTests.harness;
+
+import java.util.Vector;
+import java.util.StringTokenizer;
+import java.util.Properties;
+
+
+/**
+  <p>This class is for IBM's J9 jdk 1.5 subset - 2.4
+
+ */
+public class j9dee15 extends jvm {
+
+	public String getName(){return "j9dee15";}
+    public j9dee15(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
+    long ss, long oss, long ms, long mx, String classpath, String prof,
+    boolean verify, boolean noverify, boolean nojit, Vector D) {
+        super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
+		verify,noverify,nojit,D);
+    }
+    // more typical use:
+    public j9dee15(String classpath, Vector D) {
+        super(classpath,D);
+    }
+    // more typical use:
+    public j9dee15(long ms, long mx, String classpath, Vector D) {
+        super(ms,mx,classpath,D);
+    }
+    // actual use
+    public j9dee15() {
+	Properties sp = System.getProperties();
+	String srvJvm = sp.getProperty("serverJvm");
+	if ((srvJvm!=null) && (srvJvm.toUpperCase().startsWith("J9")))
+	{
+		String wshome = guessWSHome();
+		// note, may have to switch to sep instead of hardcoding the slashes...
+        setJavaCmd(wshome+"/bin/j9");
+	}
+	else
+		setJavaCmd("j9");
+    }
+
+    // return the command line to invoke this VM.  The caller then adds
+    // the class and program arguments.
+    public Vector getCommandLine() 
+    {
+
+        StringBuffer sb = new StringBuffer();
+        Vector v = super.getCommandLine();
+
+        appendOtherFlags(sb);
+        String s = sb.toString();
+        StringTokenizer st = new StringTokenizer(s);
+        while (st.hasMoreTokens())
+        {
+            v.addElement(st.nextToken());
+        }
+        return v;
+	}
+
+	public void appendOtherFlags(StringBuffer sb)
+	{
+
+	Properties sp = System.getProperties();
+	String srvJvm = sp.getProperty("serverJvm");
+	
+        if (noasyncgc) warn("j9dee15 does not support noasyncgc");
+        if (verbosegc) sb.append(" -verbose:gc");
+        if (noclassgc) warn("j9dee15 does not support noclassgc");
+        if (ss>=0) warn("j9dee15 does not support ss");
+        if (oss>=0) warn("j9dee15 does not support oss");
+        if (ms>=0) {
+          sb.append(" -Xss");
+          sb.append(ms);
+		  //sb.append("k");
+        }
+        if (mx>=0) {
+          sb.append(" -Xmx");
+          sb.append(mx);
+		  //sb.append("k");
+        }
+        if (classpath!=null) warn("j9dee15 does not support classpath, use -Xbootclasspath,-Xbootclasspath/p,-Xbootclasspath/a");

+        if (prof!=null) warn("j9dee15 does not support prof");
+        if (verify) sb.append(" -verify");
+        if (noverify) warn("j9dee15 does not support noverify");
+        if (nojit) sb.append(" -Xnojit");
+        if (D != null)
+          for (int i=0; i<D.size();i++) {
+	        sb.append(" -D");
+	        sb.append((String)(D.elementAt(i)));
+          }
+    }
+	public String getDintro() { return "-D"; }
+
+
+}

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9dee15.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionOFB.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionOFB.properties?rev=738671&r1=738670&r2=738671&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionOFB.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionOFB.properties
Wed Jan 28 23:29:24 2009
@@ -12,7 +12,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+#
+# with IBM's Desktop EE jvm the OFB algorithm is not supported
+runwithj9dee15=false
 encryption=true
 testEncryptionAlgorithm=DES/OFB/NoPadding
 testJavaFlags=testDataEncryption=Thursday



Mime
View raw message