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 km...@apache.org on 2011/09/29 03:21:04 UTC
svn commit: r1177146 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting:
functionTests/tests/engine/_Suite.java junit/BaseTestCase.java
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.