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 km...@apache.org on 2006/04/05 22:56:28 UTC
svn commit: r391806 - in /db/derby/code/trunk/java/testing: ./
org/apache/derbyTesting/functionTests/tests/upgradeTests/
Author: kmarsden
Date: Wed Apr 5 13:56:27 2006
New Revision: 391806
URL: http://svn.apache.org/viewcvs?rev=391806&view=rev
Log:
DERBY-514 Integrate upgrade tests into test suite.
Contributed by Deepa Remesh
Attaching a patch 'derby-514-buildfiles-v1.diff' which adds the build files for upgrade tests. This patch also adds the properties file for upgrade test which specifies not to run with security manager as more work is needed in this area (DERBY-1135).
This patch affects upgrade tests only. This is an incremental patch and does not resolve the issue fully. Please take a look at this patch. Thanks.
Added:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Upgrade_10_1_10_2_app.properties (with props)
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml (with props)
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/copyfiles.ant (with props)
Modified:
db/derby/code/trunk/java/testing/build.xml
Modified: db/derby/code/trunk/java/testing/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/build.xml?rev=391806&r1=391805&r2=391806&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/build.xml (original)
+++ db/derby/code/trunk/java/testing/build.xml Wed Apr 5 13:56:27 2006
@@ -57,6 +57,7 @@
<ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/unit"/>
<ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/i18n"/>
<ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/jdbc4"/>
+ <ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/upgradeTests"/>
<ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/largedata"/>
<ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/multi/stress"/>
<ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/master"/>
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Upgrade_10_1_10_2_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Upgrade_10_1_10_2_app.properties?rev=391806&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Upgrade_10_1_10_2_app.properties (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Upgrade_10_1_10_2_app.properties Wed Apr 5 13:56:27 2006
@@ -0,0 +1,2 @@
+# Need to find out the set of permissions required by upgrade test - DERBY-1135
+noSecurityManager=true
\ No newline at end of file
Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Upgrade_10_1_10_2_app.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml?rev=391806&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml Wed Apr 5 13:56:27 2006
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+
+<!-- ==================================================================== -->
+<!-- Derby build file -->
+<!-- ==================================================================== -->
+
+<project default="FTOtestsubdir" basedir="../../../../../../../.." >
+
+<!-- ==================================================================== -->
+<!-- Set properties -->
+<!-- ==================================================================== -->
+
+ <!-- User settings -->
+ <property file="${user.home}/ant.properties"/>
+
+ <!-- Set property lib dir -->
+ <property name="properties.dir" value="tools/ant/properties" />
+
+ <!-- Significant dirs -->
+ <property file="${properties.dir}/dirs.properties"/>
+ <property file="${properties.dir}/derbytesting.properties"/>
+
+ <!-- Compiler settings -->
+ <property file="${properties.dir}/sane${sanity}.properties"/>
+ <property file="${properties.dir}/defaultcompiler.properties"/>
+ <property file="${properties.dir}/${build.compiler}.properties"/>
+
+ <!-- Parser properties -->
+ <!--property file="${properties.dir}/parser.properties"/-->
+
+ <!-- Compile-time classpath properties files -->
+ <property file="${properties.dir}/extrapath.properties"/>
+ <property file="${properties.dir}/compilepath.properties"/>
+
+ <!-- Release and Version info -->
+ <property file="${properties.dir}/release.properties"/>
+
+ <!-- derby testing specific properties files -->
+ <property file="${ant.home}/properties/derbytesting.properties"/>
+ <property file="${user.home}/properties/derbytesting.properties"/>
+ <property name="this.dir" value="${derby.testing.functest.dir}/tests/upgradeTests"/>
+
+<!-- ============ Begin Targets ============== -->
+
+ <target name="FTOtestsubdir" depends="compilet1,copyfiles"/>
+
+ <!-- mkdir / init target may not be necessary, just here for reference... -->
+ <target name="init">
+ <mkdir dir="${out.dir}/${derby.testing.functest.dir}/tests/upgradeTests"/>
+ </target>
+
+ <target name="compilet1">
+ <javac
+ bootclasspath="${empty}"
+ nowarn="on"
+ debug="${debug}"
+ depend="${depend}"
+ deprecation="${deprecation}"
+ optimize="${optimize}"
+ proceed="${proceed}"
+ verbose="${verbose}"
+ srcdir="${derby.testing.src.dir}"
+ destdir="${out.dir}">
+ <classpath>
+ <!--pathelement location="${oro}"/-->
+ <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>
+
+
+<!-- ============= End Targets ============== -->
+
+<!-- ============= End Project ============== -->
+
+</project>
+
Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/copyfiles.ant
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/copyfiles.ant?rev=391806&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/copyfiles.ant (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/copyfiles.ant Wed Apr 5 13:56:27 2006
@@ -0,0 +1 @@
+Upgrade_10_1_10_2_app.properties
Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/copyfiles.ant
------------------------------------------------------------------------------
svn:eol-style = native