Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 5578 invoked from network); 3 Feb 2009 14:34:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Feb 2009 14:34:35 -0000 Received: (qmail 78476 invoked by uid 500); 3 Feb 2009 14:34:33 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 78395 invoked by uid 500); 3 Feb 2009 14:34:33 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 78352 invoked by uid 99); 3 Feb 2009 14:34:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Feb 2009 06:34:33 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Feb 2009 14:34:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1EC742388999; Tue, 3 Feb 2009 14:34:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r740313 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java Date: Tue, 03 Feb 2009 14:34:09 -0000 To: derby-commits@db.apache.org From: myrnavl@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090203143410.1EC742388999@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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);