db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r409534 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness: RunList.java RunSuite.java RunTest.java
Date Fri, 26 May 2006 01:11:27 GMT
Author: fuzzylogic
Date: Thu May 25 18:11:26 2006
New Revision: 409534

URL: http://svn.apache.org/viewvc?rev=409534&view=rev
Log:
DERBY-1348: hack to propagate derbyTesting.jar.path from system->suite->test.
Harness' use of properties really needs cleaning up.

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=409534&r1=409533&r2=409534&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
Thu May 25 18:11:26 2006
@@ -119,8 +119,9 @@
 	static BufferedReader runlistFile;
 	static String hostName;
 	static String testEncoding;	// Encoding used for child jvm and to read the test output 
-    static String derbyTestingXaSingle;// Run junit test cases with under 
-                                // single branck xa transaction
+	static String upgradejarpath;	// Encoding used for child jvm and to read the test output

+        static String derbyTestingXaSingle;// Run junit test cases with under 
+                                           // single branck xa transaction
 	
     static String [] clientExclusionKeywords = new String [] {
         "at-or-before:", "at-or-after:", "when-at-or-before:jdk",
@@ -419,7 +420,8 @@
             jvmProps.addElement("serverJvmName=" + serverJvmName);
         if (testEncoding != null)
             jvmProps.addElement("derbyTesting.encoding=" + testEncoding);
-
+        if (upgradejarpath != null)
+            jvmProps.addElement("derbyTesting.jar.path=" + upgradejarpath);
         if ( (hostName != null) && (hostName.length()>0) )
         	jvmProps.addElement("hostName=" + hostName);
         if ( useprocess == false )
@@ -651,6 +653,7 @@
             // Reset framework to the parent suite's framework, if any
             // because framework may have been set by previous suite
             testEncoding = parentProps.getProperty("derbyTesting.encoding");
+            upgradejarpath = parentProps.getProperty("derbyTesting.jar.path");
             framework = parentProps.getProperty("framework");
             serverJvm = parentProps.getProperty("serverJvm");
             serverJvmName = parentProps.getProperty("serverJvmName");
@@ -781,6 +784,7 @@
 		serverJvmName = suiteProperties.getProperty("serverJvmName");
 		hostName = suiteProperties.getProperty("hostName");
 		testEncoding = suiteProperties.getProperty("derbyTesting.encoding");
+		upgradejarpath = suiteProperties.getProperty("derbyTesting.jar.path");
 		canondir = suiteProperties.getProperty("canondir");
 		mtestdir = suiteProperties.getProperty("mtestdir");
 		String usepr = suiteProperties.getProperty("useprocess");
@@ -871,6 +875,11 @@
 		    p.put("derbyTesting.encoding", testEncoding);
 		else
             testEncoding = p.getProperty("derbyTesting.encoding");
+
+        if(parentProperties.getProperty("derbyTesting.jar.path") != null)
+		    p.put("derbyTesting.jar.path", upgradejarpath);
+		else
+            upgradejarpath = p.getProperty("derbyTesting.jar.path");
 
         if ( hostName != null )
             p.put("hostName", hostName);

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=409534&r1=409533&r2=409534&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
Thu May 25 18:11:26 2006
@@ -480,6 +480,9 @@
 		String cmlTestEncoding = sp.getProperty("derbyTesting.encoding");
 		if (cmlTestEncoding != null)
 		    suiteProperties.put("derbyTesting.encoding", cmlTestEncoding);
+                String upgradejarpath = sp.getProperty("derbyTesting.jar.path");
+                if (upgradejarpath != null)
+                    suiteProperties.put("derbyTesting.jar.path", upgradejarpath);
 		String testout = sp.getProperty("testoutname");
 		if (testout != null)
 		    suiteProperties.put("testoutname", testout); // toursDemo

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=409534&r1=409533&r2=409534&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
Thu May 25 18:11:26 2006
@@ -126,6 +126,7 @@
 	static boolean startServer=true; // should test harness start the server
 	static String hostName; // needs to be settable for ipv testing, localhost otherwise.)
 	static String testEncoding; // Encoding used for child jvm and to read the test output
+	static String upgradejarpath; // Encoding used for child jvm and to read the test output
 	static boolean replacePolicyFile=false; // property used to see if we need to replace the
default policy file or append to it.
 
 	// Other test variables for directories, files, output
@@ -1003,6 +1004,7 @@
         }
 		
         testEncoding = sp.getProperty("derbyTesting.encoding");
+        upgradejarpath = sp.getProperty("derbyTesting.jar.path");
         if ((testEncoding != null) && (!jvmName.equals("jdk15")))
         {
             skiptest = true;
@@ -2239,6 +2241,9 @@
             jvmflags = (jvmflags==null?"":jvmflags+" ") 
                          + "-Dfile.encoding=" + testEncoding; 
         }
+        
+        if (upgradejarpath != null)
+            jvmProps.addElement("derbyTesting.jar.path=" + upgradejarpath);
             
         if ( (jvmflags != null) && (jvmflags.length()>0) )
         {



Mime
View raw message