You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by mp...@apache.org on 2003/05/11 18:24:04 UTC
cvs commit: db-torque build-test.xml
mpoeschl 2003/05/11 09:24:04
Modified: . build-test.xml
Log:
more cleanup of the runtime test build
Revision Changes Path
1.44 +4 -51 db-torque/build-test.xml
Index: build-test.xml
===================================================================
RCS file: /home/cvs/db-torque/build-test.xml,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- build-test.xml 30 Apr 2003 22:16:10 -0000 1.43
+++ build-test.xml 11 May 2003 16:24:04 -0000 1.44
@@ -19,35 +19,9 @@
<!-- ============================================================== -->
<target
- name="test-prepare"
- depends="filterTokens,test-libs">
-
- <!-- copy test schemas -->
- <copy
- todir="${torque.distDir}/schema"
- filtering="yes"
- overwrite="yes">
- <fileset dir="${rttest.dir}">
- <include name="**/*.xml"/>
- </fileset>
- </copy>
-
- <!-- copy test sql -->
- <copy
- todir="${torque.distDir}/sql"
- filtering="yes"
- overwrite="yes">
- <fileset dir="${rttest.dir}">
- <include name="*.sql"/>
- <include name="*.ref.xml"/>
- </fileset>
- </copy>
- </target>
-
- <target
name="test"
description="run the testbed">
- <antcall target="test-prepare"/>
+ <antcall target="test-libs"/>
<antcall target="test-pre-runtime"/>
<antcall target="test-runtime"/>
<antcall target="test-post-runtime"/>
@@ -233,18 +207,6 @@
</ant>
</target>
- <target name="filterTokens">
- <filter token="APPLICATION_ROOT" value="."/>
- <filter token="DATABASE" value="${torque.database}"/>
- <filter token="DATABASE_DEFAULT" value="${torque.defaultDatabase}"/>
- <filter token="DATABASE_URL" value="${torque.database.url}"/>
- <filter token="DATABASE_USER" value="${torque.database.user}"/>
- <filter token="DATABASE_DRIVER" value="${torque.database.driver}"/>
- <filter token="DATABASE_PASSWORD" value="${torque.database.password}"/>
- <filter token="DATABASE_ID_METHOD" value="${torque.idMethod}"/>
- <filter token="DATABASE_ADAPTER" value="${torque.database}"/>
- </target>
-
<!-- ============================================================== -->
<!-- R U N T I M E T E S T S -->
<!-- ============================================================== -->
@@ -260,16 +222,7 @@
</path>
<target
- name="test-runtime"
- depends="filterTokens">
-
- <!-- Copy test Torque.properties -->
- <copy
- tofile="${build.test}/rttest/Torque.properties"
- file="src/conf/master/Torque.master"
- filtering="yes"
- overwrite="yes"
- />
+ name="test-runtime">
<!-- Runs the actual rttest tests -->
<junit printsummary="no" haltonfailure="yes" fork="true">
@@ -283,8 +236,8 @@
<batchtest todir="target/test-reports/">
<fileset dir="${torque.destDir}">
- <include name="**/*Test*.class"/>
- <exclude name="**/BaseTestCase.class"/>
+ <include name="**/*Test.class"/>
+ <exclude name="**/test/*.class"/>
<exclude name="**/LargeSelectTest.class"/>
</fileset>
</batchtest>