db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r520044 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ suites/ tests/upgradeTests/
Date Mon, 19 Mar 2007 18:52:58 GMT
Author: djd
Date: Mon Mar 19 11:52:57 2007
New Revision: 520044

URL: http://svn.apache.org/viewvc?view=rev&rev=520044
Log:
DERBY-2217 Remove old harness based upgrade test.

Removed:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_2.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_3.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/upgrade.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/upgrade.runall
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTester.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Upgrade_10_1_10_2.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Upgrade_10_1_10_2_sed.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Upgrade_10_1_10_3.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Upgrade_10_1_10_3_sed.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/copyfiles.ant
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties?view=diff&rev=520044&r1=520043&r2=520044
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties
Mon Mar 19 11:52:57 2007
@@ -1,3 +1,3 @@
-suites=derbylang derbynetmats storeall xa derbytools jdbc20 jdbc40 jdk14 jdbcapi derbynetclientmats
encryptionAll demo multi unit i18nTest upgrade
+suites=derbylang derbynetmats storeall xa derbytools jdbc20 jdbc40 jdk14 jdbcapi derbynetclientmats
encryptionAll demo multi unit i18nTest
 derby.debug.true=enableBtreeConsistencyCheck
 derby.stream.error.logSeverityLevel=0

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml?view=diff&rev=520044&r1=520043&r2=520044
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml
Mon Mar 19 11:52:57 2007
@@ -58,7 +58,7 @@
 
 <!--             ============ Begin Targets ==============                -->
  
-  <target name="FTOtestsubdir" depends="compilet1,copyfiles,checkUpgradeAppProps,updateProperty"/>
+  <target name="FTOtestsubdir" depends="compilet1"/>
 
   <!-- mkdir / init target may not be necessary, just here for reference... -->
   <target name="init">
@@ -80,44 +80,13 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java14compile.classpath}"/>
+        <pathelement path="${compile.classpath}"/>
 	<pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>
     </javac>
   </target>
 
-  <target name="copyfiles">
-    <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/upgradeTests">
-      <fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/upgradeTests"

-        includesfile="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/upgradeTests/copyfiles.ant"/>
 
-    </copy>
-  </target> 
-	
-  <target name="checkUpgradeAppProps">		
-  	<available file="${out.dir}/${derby.testing.functest.dir}/tests/upgradeTests/Upgrade_10_1_10_3_app.properties"
property="haveUpgradeProps"/>
-  </target>
- 
-  <target name="updateProperty" unless="haveUpgradeProps">
-  	<antcall target="setpropertydefault" />
-  	<antcall target="setproperty" />  	
-  </target>
-	
-  <target name="setpropertydefault" unless="derbyTesting.jar.path">
-  	<propertyfile file="${out.dir}/${derby.testing.functest.dir}/tests/upgradeTests/Upgrade_10_1_10_3_app.properties"
-                      comment="Need to find out the set of permissions required by upgrade
test - DERBY-1135">
-		<entry key="jvmflags" value="-DderbyTesting.jar.path=${src.dir}/tools/testing/derby"/>
-		<entry key="noSecurityManager" value="true"/>
-	</propertyfile>
-  </target>
-	
-  <target name="setproperty" if="derbyTesting.jar.path">
-  	<propertyfile file="${out.dir}/${derby.testing.functest.dir}/tests/upgradeTests/Upgrade_10_1_10_3_app.properties"
-                      comment="Need to find out the set of permissions required by upgrade
test - DERBY-1135">
-  		<entry key="jvmflags" value="-DderbyTesting.jar.path=${derbyTesting.jar.path}" />
-		<entry key="noSecurityManager" value="true"/>
-  	</propertyfile>
-  </target> 	
 
 <!--             ============= End Targets ==============                -->
 



Mime
View raw message