You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by dj...@apache.org on 2007/10/27 00:56:59 UTC
svn commit: r588789 - in /db/derby/code/trunk: build.xml
java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java
Author: djd
Date: Fri Oct 26 15:56:58 2007
New Revision: 588789
URL: http://svn.apache.org/viewvc?rev=588789&view=rev
Log:
Allow derbyTesting.oldReleasePath to be set as an ant property (e.g. in ant.properties) and then be picked up when the tests are run through ant.
Modified:
db/derby/code/trunk/build.xml
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java
Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=588789&r1=588788&r2=588789&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Fri Oct 26 15:56:58 2007
@@ -1770,6 +1770,11 @@
<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
@@ -1782,6 +1787,7 @@
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/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java?rev=588789&r1=588788&r2=588789&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java Fri Oct 26 15:56:58 2007
@@ -239,14 +239,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);