You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by my...@apache.org on 2009/02/03 15:34:09 UTC
svn commit: r740313 -
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
Author: myrnavl
Date: Tue Feb 3 14:34:09 2009
New Revision: 740313
URL: http://svn.apache.org/viewvc?rev=740313&view=rev
Log:
DERBY-3972 - patch part2, enabling desktopEE to run tests flagged with
with runwithj9=false, such as network server tests.
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
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=740313&r1=740312&r2=740313&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 Tue Feb 3 14:34:09 2009
@@ -686,7 +686,7 @@
runwithj9 = parentProps.getProperty("runwithj9");
runwithibmjvm = parentProps.getProperty("runwithibmjvm");
String testJVM = jvmName;
- if (jvmName.startsWith("j9"))
+ if (jvmName.startsWith("j9") && (!jvmName.startsWith("j9dee")))
testJVM = (jvmName.startsWith("j9_foundation") ? "foundation" : "j9");
runwithjvm = parentProps.getProperty("runwith" + testJVM);
excludeJCC = parentProps.getProperty("excludeJCC");
@@ -788,7 +788,7 @@
runwithj9 = suiteProperties.getProperty("runwithj9");
derbyTestingXaSingle = suiteProperties.getProperty("derbyTesting.xa.single");
String testJVM = jvmName;
- if (jvmName.startsWith("j9"))
+ if (jvmName.startsWith("j9") && (!jvmName.startsWith("j9dee")))
testJVM = (jvmName.startsWith("j9_foundation") ? "foundation" : "j9");
runwithjvm = suiteProperties.getProperty("runwith" + testJVM);
excludeJCC = suiteProperties.getProperty("excludeJCC");
@@ -961,7 +961,7 @@
// runwithjvm may be set at the top or just for a subsuite
String testJVM = jvmName;
- if (jvmName.startsWith("j9"))
+ if (jvmName.startsWith("j9") && (!jvmName.startsWith("j9dee")))
testJVM = (jvmName.startsWith("j9_foundation") ? "foundation" : "j9");
if ( parentProperties.getProperty("runwith" + testJVM) != null )
p.put("runwith" + testJVM, runwithjvm);