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 rh...@apache.org on 2018/11/30 23:27:39 UTC
svn commit: r1847862 - in
/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting:
functionTests/suites/AllPackages.java junit/BaseTestCase.java
Author: rhillegas
Date: Fri Nov 30 23:27:39 2018
New Revision: 1847862
URL: http://svn.apache.org/viewvc?rev=1847862&view=rev
Log:
DERBY-7011: Short-circuit the Jenkins tests when running with the modulepath--in order to get more diagnostic information; tests ran cleanly on derby-7011-01-aa-shortCircuitAfterDerbyNetSuite.diff.
Modified:
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/suites/AllPackages.java
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/junit/BaseTestCase.java
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/suites/AllPackages.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/suites/AllPackages.java?rev=1847862&r1=1847861&r2=1847862&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/suites/AllPackages.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/suites/AllPackages.java Fri Nov 30 23:27:39 2018
@@ -85,7 +85,11 @@ public class AllPackages extends BaseTes
ArrayList<Object> classes = new ArrayList<Object>();
classes.add(org.apache.derbyTesting.functionTests.tests.derbynet._Suite.class);
- classes.add(org.apache.derbyTesting.functionTests.tests.lang._Suite.class);
+
+ if (shortCircuitFor_derby_7011()) { return classes; }
+
+ classes.add(org.apache.derbyTesting.functionTests.tests.lang._Suite.class);
+
// DERBY-1903
// For the largedata test, just run the lite version of the test as
// the full test is too big.
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/junit/BaseTestCase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/junit/BaseTestCase.java?rev=1847862&r1=1847861&r2=1847862&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/junit/BaseTestCase.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/junit/BaseTestCase.java Fri Nov 30 23:27:39 2018
@@ -927,6 +927,18 @@ public abstract class BaseTestCase
}
/**
+ * Temporary method to stabilize the modulepath tests. See DERBY-7011.
+ * @return true if we should short-circuit the module tests.
+ */
+ public static final boolean shortCircuitFor_derby_7011()
+ {
+ boolean isModuleAware = JVMInfo.isModuleAware();
+ boolean isJenkinsRun = getSystemProperty("user.dir").startsWith("/home/jenkins");
+
+ return isModuleAware && isJenkinsRun;
+ }
+
+ /**
* Check if this is java 5
* @return true if java.version system property starts with 1.5
*/