svn commit: r596851 - in /db/derby/code/branches/10.3: build.xml java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java

[dj...@apache.org]

Author: djd
Date: Tue Nov 20 14:25:13 2007
New Revision: 596851

URL: http://svn.apache.org/viewvc?rev=596851&view=rev
Log:
Merge 562604 & 588789 from trunk - improvements in running the junit tests through ant (562604 is from DERBY-2988

Modified:
    db/derby/code/branches/10.3/build.xml
    db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java

Modified: db/derby/code/branches/10.3/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/build.xml?rev=596851&r1=596850&r2=596851&view=diff
==============================================================================
--- db/derby/code/branches/10.3/build.xml (original)
+++ db/derby/code/branches/10.3/build.xml Tue Nov 20 14:25:13 2007
@@ -1724,13 +1724,24 @@
         <isset property="derby.junit.classpath"/>
       </not>
     </condition>
+    <condition property="derbyTesting.oldReleasePath" value="">
+      <not>
+        <isset property="derbyTesting.oldReleasePath"/>
+      </not>
+    </condition>
+         <!--
+         Specifying max heap size (maxmemory) for JVMs spawned by this
+         target, since the default max heap size on most systems is
+         currently too low for some of the test suites. See DERBY-2988.
+         -->
   	 <junit printsummary="on"
            fork="yes" forkmode="perTest"
-           jvm="${derby.junit.jvm}"
+           jvm="${derby.junit.jvm}" maxmemory="512m"
            showoutput="yes"
            dir="junit_${derby.junit.timestamp}"
   	 	   errorproperty="tests.failed"
   	       failureproperty="tests.failed">
+      <sysproperty key="derbyTesting.oldReleasePath" value="${derbyTesting.oldReleasePath}"/>
       <formatter type="xml"/>
   	 	
 <test name="org.apache.derbyTesting.functionTests.tests.jdbcapi.AutoloadTest"

Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java?rev=596851&r1=596850&r2=596851&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java (original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java Tue Nov 20 14:25:13 2007
@@ -236,14 +236,15 @@
     
     /**
      * Get the location of jars of old release. The location is specified 
-     * in the property derbyTesting.oldReleasePath.
+     * in the property derbyTesting.oldReleasePath. If derbyTesting.oldReleasePath
+     * is set to the empty string it is ignored.
      *  
      * @return location of jars of old release
      */
     private static String getOldJarLocation(int[] oldVersion) {
         String jarPath = System.getProperty(_Suite.OLD_RELEASE_PATH_PROPERTY);
       
-        if (jarPath == null)
+        if (jarPath == null || jarPath.length() == 0)
             return null;
         
         String version = getTextVersion(oldVersion);