db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1026030 - in /db/derby/code/branches/10.5: ./ java/testing/org/apache/derbyTesting/functionTests/harness/
Date Thu, 21 Oct 2010 15:38:52 GMT
Author: kmarsden
Date: Thu Oct 21 15:38:52 2010
New Revision: 1026030

URL: http://svn.apache.org/viewvc?rev=1026030&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.5/   (props changed)
    db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
    db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
    db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java

Propchange: db/derby/code/branches/10.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 21 15:38:52 2010
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.6:942027,957000,962738,965351,987678
-/db/derby/code/trunk:757811,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,791027,792434,793089,793588,794106,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915733,916075,916897,918152,918359,921028,927430,928065,929085,934474,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952581,954748,955001,955634,956075,956445,956659,958163,959550,962716,965647,967304,980684,986689,986834,999119,1002291,1002682,1002853,1021426
+/db/derby/code/trunk:757811,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,791027,792434,793089,793588,794106,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915733,916075,916897,918152,918359,921028,927430,928065,929085,934474,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952581,954748,955001,955634,956075,956445,956659,958163,959550,962716,965647,967304,980684,986689,986834,999119,1002291,1002682,1002853,1021426,1025795

Modified: db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java?rev=1026030&r1=1026029&r2=1026030&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
(original)
+++ db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
Thu Oct 21 15:38:52 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.5/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java?rev=1026030&r1=1026029&r2=1026030&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
(original)
+++ db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
Thu Oct 21 15:38:52 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.5/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java?rev=1026030&r1=1026029&r2=1026030&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
(original)
+++ db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
Thu Oct 21 15:38:52 2010
@@ -1610,7 +1610,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