db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1026075 - in /db/derby/code/branches/10.6: ./ java/testing/org/apache/derbyTesting/functionTests/harness/
Date Thu, 21 Oct 2010 17:25:46 GMT
Author: kmarsden
Date: Thu Oct 21 17:25:46 2010
New Revision: 1026075

URL: http://svn.apache.org/viewvc?rev=1026075&view=rev
Log:
DERBY-4860 RunSuite on derbylang and other subsuites fails with java.lang.NoClassDefFoundError
because of prepended ^


Modified:
    db/derby/code/branches/10.6/   (props changed)
    db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
    db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
    db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java

Propchange: db/derby/code/branches/10.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 21 17:25:46 2010
@@ -1,2 +1,2 @@
-/db/derby/code/trunk:938547,938796,938959,939231,940462,940469,941627,942031,942286,942476,942480,942587,944152,946794,948045,948069,951346,951366,952138,952237,952581,954344,954421,954544,954748,955001,955540,955634,956075,956234,956445,956569,956659,957260,958163,958522,958555,958618,958939,959550,962716,963206,963705,964115,965647,967304,980684,986689,986834,987539,989099,990292,997325,998170,999119,1002291,1002682,1002853,1021426
+/db/derby/code/trunk:938547,938796,938959,939231,940462,940469,941627,942031,942286,942476,942480,942587,944152,946794,948045,948069,951346,951366,952138,952237,952581,954344,954421,954544,954748,955001,955540,955634,956075,956234,956445,956569,956659,957260,958163,958522,958555,958618,958939,959550,962716,963206,963705,964115,965647,967304,980684,986689,986834,987539,989099,990292,997325,998170,999119,1002291,1002682,1002853,1021426,1025795
 /db/derby/docs/trunk:954344

Modified: db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java?rev=1026075&r1=1026074&r2=1026075&view=diff
==============================================================================
--- db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
(original)
+++ db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
Thu Oct 21 17:25:46 2010
@@ -861,9 +861,12 @@ public class RunList
         String totaljvmflags = jvmflags;
         String subjvmflags = p.getProperty("jvmflags");
         String parentjvmflags = parentProperties.getProperty("jvmflags");
+        
         if ((subjvmflags != null) && (parentjvmflags != null) && (!subjvmflags.equals(parentjvmflags)))
         {
-            totaljvmflags = subjvmflags + "^" + totaljvmflags;
+            //DERBY-4680 Make sure ^ does not get prepended to jvmflags
+            if (subjvmflags != null &&  subjvmflags.length() > 0)
+                totaljvmflags = subjvmflags + "^" + totaljvmflags;
         }
         if (totaljvmflags != null)
         {

Modified: db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java?rev=1026075&r1=1026074&r2=1026075&view=diff
==============================================================================
--- db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
(original)
+++ db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
Thu Oct 21 17:25:46 2010
@@ -392,22 +392,23 @@ public class RunSuite
 		// when the time comes to have this converted into actual jvm flags
 		// the ones given at the command line will overwrite whatever's in the suite
 		String jflags = sp.getProperty("jvmflags");
-		if (jvmflags != null)
+		if (jvmflags != null && jvmflags.length() > 0)
 		{
-			if (jflags != null)
+		  //DERBY-4680 Make sure ^ does not get appended to jvmflags
+		    if (jflags != null && jflags.length() > 0)
 		    		suiteProperties.put("jvmflags", (jvmflags + "^" + jflags));
 			else
 		    		suiteProperties.put("jvmflags", jvmflags);
 		}
 		else
 		{
-			if (jflags != null)
+			if (jflags != null && jflags.length() >0)
 		    		suiteProperties.put("jvmflags", jflags);
 		}
 		String testflags = sp.getProperty("testJavaFlags");
 		if (testflags != null)
 		{
-		    if (testJavaFlags == null)
+		    if (testJavaFlags == null || testJavaFlags.length() == 0)
 		        testJavaFlags = testflags;
 		    else // add to testJavaFlags
 		        testJavaFlags = testJavaFlags + "^" + testflags;
@@ -416,7 +417,7 @@ public class RunSuite
 		String testprops = sp.getProperty("testSpecialProps");
 		if (testprops != null)
 		{
-		    if (testSpecialProps == null)
+		    if (testSpecialProps == null || testSpecialProps.length() == 0)
 		        testSpecialProps = testprops;
 		    else // add to testSpecialProps
 		        testSpecialProps = testSpecialProps + "^" + testprops;

Modified: db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java?rev=1026075&r1=1026074&r2=1026075&view=diff
==============================================================================
--- db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
(original)
+++ db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
Thu Oct 21 17:25:46 2010
@@ -1598,7 +1598,7 @@ clp.list(System.out);
             String apppropsjvmflags = ap.getProperty("jvmflags");
             if (apppropsjvmflags != null)
             {
-                if (jvmflags != null)
+                if (jvmflags != null && jvmflags.length() > 0)
                     jvmflags = apppropsjvmflags + "^" + jvmflags;
                 else
                     jvmflags = apppropsjvmflags;



Mime
View raw message