Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4C6FA4FED for ; Mon, 6 Jun 2011 14:05:10 +0000 (UTC) Received: (qmail 43912 invoked by uid 500); 6 Jun 2011 14:05:10 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 43867 invoked by uid 500); 6 Jun 2011 14:05:10 -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 43856 invoked by uid 99); 6 Jun 2011 14:05:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Jun 2011 14:05:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Mon, 06 Jun 2011 14:05:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id ED26423888DD; Mon, 6 Jun 2011 14:04:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1132648 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility: CompatibilityCombinations.java README.html Date: Mon, 06 Jun 2011 14:04:48 -0000 To: derby-commits@db.apache.org From: kahatlen@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110606140448.ED26423888DD@eris.apache.org> Author: kahatlen Date: Mon Jun 6 14:04:48 2011 New Revision: 1132648 URL: http://svn.apache.org/viewvc?rev=1132648&view=rev Log: DERBY-5145: Provide option to limit compatibility test to combinations that include trunk Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/CompatibilityCombinations.java db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/README.html Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/CompatibilityCombinations.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/CompatibilityCombinations.java?rev=1132648&r1=1132647&r2=1132648&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/CompatibilityCombinations.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/CompatibilityCombinations.java Mon Jun 6 14:04:48 2011 @@ -218,6 +218,11 @@ public class CompatibilityCombinations e private final static String networkServerControl = "org.apache.derby.drda.NetworkServerControl"; private static String specialTestingJar = null; // None null if using e.g. your own modified tests. + /** + * Only test the combinations that include the latest version if this + * flag is true. + */ + private static boolean latestOnly; private static String singleClient = null; // Integer string property specifying which Derby version to use for client. private static String singleClientVM = null; @@ -477,6 +482,7 @@ public class CompatibilityCombinations e * The number of combinations can be restricted by specifying the * properties *
    + *
  • test.latestOnly *
  • test.singleServer *
  • test.singleServerVM *
  • test.singleClient @@ -569,6 +575,16 @@ public class CompatibilityCombinations e { int clientVersionLow = 0; int clientVersionHigh = derbyLib.length-1; + + if (latestOnly && serverVersion != clientVersionHigh) + { + // We only want to test combinations that include the + // latest Derby version (typically trunk). If the + // server is not at the latest version, we only need + // to test it against the latest client version. + clientVersionLow = clientVersionHigh; + } + if ( singleClient != null ) { clientVersionLow = Integer.parseInt(singleClient); @@ -804,6 +820,7 @@ public class CompatibilityCombinations e *
  • test.showSysinfo *
  • test.serverPort *
  • test.includeUpgrade + *
  • test.latestOnly *
  • test.singleClient *
  • test.singleClientVM *
  • test.singleServer @@ -867,7 +884,11 @@ public class CompatibilityCombinations e includeUpgrade = cp.getProperty("test.includeUpgrade","false").equalsIgnoreCase("true"); System.out.println("includeUpgrade: " + includeUpgrade); - + + latestOnly = + cp.getProperty("test.latestOnly", "false").equalsIgnoreCase("true"); + System.out.println("latestOnly: " + latestOnly); + singleClient = cp.getProperty("test.singleClient",null); // E.g. 5 for derby.version5, see property file System.out.println("singleClient: " + singleClient); Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/README.html URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/README.html?rev=1132648&r1=1132647&r2=1132648&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/README.html (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/README.html Mon Jun 6 14:04:48 2011 @@ -275,6 +275,12 @@ db2jcc_lib=/opt/db2jcc/lib ## test.singleServer=3 ## test.singleServerVM=1 ## +## Test only combinations that use the latest Derby version either on +## the server side or on the client side (assuming the derby.versionN +## property with the highest N points to the latest version): +## +## test.latestOnly=true +##