db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1025795 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness: RunList.java RunSuite.java RunTest.java
Date Wed, 20 Oct 2010 23:55:26 GMT
Author: kmarsden
Date: Wed Oct 20 23:55:26 2010
New Revision: 1025795

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

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java?rev=1025795&r1=1025794&r2=1025795&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
Wed Oct 20 23:55:26 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/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java?rev=1025795&r1=1025794&r2=1025795&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
Wed Oct 20 23:55:26 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/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java?rev=1025795&r1=1025794&r2=1025795&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
Wed Oct 20 23:55:26 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