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 F2F9B7A24 for ; Thu, 29 Sep 2011 01:21:25 +0000 (UTC) Received: (qmail 56160 invoked by uid 500); 29 Sep 2011 01:21:25 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 56110 invoked by uid 500); 29 Sep 2011 01:21:25 -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 56101 invoked by uid 99); 29 Sep 2011 01:21:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Sep 2011 01:21:25 +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; Thu, 29 Sep 2011 01:21:24 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6B5A0238888F; Thu, 29 Sep 2011 01:21:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1177146 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting: functionTests/tests/engine/_Suite.java junit/BaseTestCase.java Date: Thu, 29 Sep 2011 01:21:04 -0000 To: derby-commits@db.apache.org From: kmarsden@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110929012104.6B5A0238888F@eris.apache.org> Author: kmarsden Date: Thu Sep 29 01:21:03 2011 New Revision: 1177146 URL: http://svn.apache.org/viewvc?rev=1177146&view=rev Log: DERBY-5434 On linux with IBM JDK 1.7 suites.All does not run at all failing with java.lang.reflect.InvocationTargetException This patch does not fix the problem but skips adding engine.RestrictiveFilePermissiionsTest to the suite with IBM 1.7, so that other tests can run Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/_Suite.java db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/_Suite.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/_Suite.java?rev=1177146&r1=1177145&r2=1177146&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/_Suite.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/_Suite.java Thu Sep 29 01:21:03 2011 @@ -48,7 +48,9 @@ public class _Suite extends BaseTestCase suite.addTest(ErrorStreamTest.suite()); suite.addTest(LockInterruptTest.suite()); - suite.addTest(RestrictiveFilePermissionsTest.suite()); + // for now disable on IBM 1.7 DERBY-5434 + if (!(isIBMJVM() && isJava7())) + suite.addTest(RestrictiveFilePermissionsTest.suite()); suite.addTest(ModuleLoadingTest.suite()); return suite; Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java?rev=1177146&r1=1177145&r2=1177146&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java Thu Sep 29 01:21:03 2011 @@ -639,6 +639,9 @@ public abstract class BaseTestCase return getSystemProperty("java.version").startsWith("1.5"); } + public static final boolean isJava7() { + return getSystemProperty("java.version").startsWith("1.7"); + } /** * Returns the major version of the class specification version supported * by the running JVM.