db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krist...@apache.org
Subject svn commit: r1448280 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit: BaseTestCase.java SecurityManagerSetup.java
Date Wed, 20 Feb 2013 16:34:22 GMT
Author: kristwaa
Date: Wed Feb 20 16:34:21 2013
New Revision: 1448280

URL: http://svn.apache.org/r1448280
Log:
DERBY-6079: 100's of errors in nightly test run on weme after jacoco property/priviledges
checkin

Propagate jacoco.active on weme6.2 (1a).
Always set jacoco.active and emma.active on weme6.2 (2a).

Patch file: derby-6079-1a-propagate_jacocoactive_j9.diff, derby-6079-2a-set_props_j9.diff

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java

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=1448280&r1=1448279&r2=1448280&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 Wed Feb
20 16:34:21 2013
@@ -591,8 +591,14 @@ public abstract class BaseTestCase
             // also add the setting for emma.active so any tests
             // that fork will work correctly. See DERBY-5558.
             String emmaactive=getSystemProperty("emma.active");
-            if (emmaactive != null)
+            if (emmaactive != null) {
                 cmdlist.add("-Demma.active=" + emmaactive);            
+            }
+            // Do the same for jacoco.active, see DERBY-6079.
+            String jacocoactive = getSystemProperty("jacoco.active");
+            if (jacocoactive != null) {
+                cmdlist.add("-Djacoco.active=" + jacocoactive);
+            }
 	    }
 
         if (isCVM()) {

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java?rev=1448280&r1=1448279&r2=1448280&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java
Wed Feb 20 16:34:21 2013
@@ -89,6 +89,14 @@ public final class SecurityManagerSetup 
         
 	}
 
+    static {
+        // Work around bug in weme6.2 (DERBY-5558 and DERBY-6079).
+        if (BaseTestCase.isJ9Platform()) {
+            BaseTestCase.setSystemProperty("emma.active", "");
+            BaseTestCase.setSystemProperty("jacoco.active", "");
+        }
+    }
+
     static final boolean jacocoEnabled = checkIfJacocoIsRunning();
     private static boolean checkIfJacocoIsRunning() {
         return ((Boolean)AccessController.doPrivileged(new PrivilegedAction() {



Mime
View raw message