You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2001/06/21 21:46:59 UTC
cvs commit: jakarta-turbine/build build-test.xml build-torque.xml build.properties build.xml
jvanzyl 01/06/21 12:46:58
Modified: build build-torque.xml build.properties build.xml
Added: build build-test.xml
Log:
- separating the testing into its own build file.
the tests still need to be split up into unit vs live tests,
but as our testing is little more than meagre this really
isn't an issue yet. i work out the live vs non-live test
thing so that GUMP can start running tests on a daily
basis.
Revision Changes Path
1.9 +0 -9 jakarta-turbine/build/build-torque.xml
Index: build-torque.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine/build/build-torque.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build-torque.xml 2001/05/14 18:40:22 1.8
+++ build-torque.xml 2001/06/21 19:46:55 1.9
@@ -5,12 +5,6 @@
<!-- of the TDK. -->
<!-- ================================================================== -->
- <!--
- Everything needed is here because I'll probably move this
- into a separate xml file and use an ant call from here.
- this build file is getting big! :-)
- -->
-
<target name="main">
<property name="torque.dir" value="${build.dir}/torque/torque"/>
@@ -38,9 +32,6 @@
<jar jarfile="${torque.dir}/lib/torque.jar">
<fileset dir="${build.dir}/classes"/>
</jar>
-
- <!-- fix permissions -->
- <chmod dir="${torque.dir}" perm="ugo+rx" includes="**/*.sh" />
<zip zipfile="${build.dir}/torque.zip"
basedir="${build.dir}/torque"
1.2 +5 -0 jakarta-turbine/build/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine/build/build.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.properties 2001/06/21 14:51:20 1.1
+++ build.properties 2001/06/21 19:46:55 1.2
@@ -16,3 +16,8 @@
docs.src = ../xdocs
docs.dest = ../docs
turbine.jars = ../lib
+year = 1999-2000
+debug = on
+optimize = off
+deprecation = off
+jdom.jar = jdom-b6.jar
1.11 +11 -64 jakarta-turbine/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine/build/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 2001/06/21 14:55:58 1.10
+++ build.xml 2001/06/21 19:46:55 1.11
@@ -20,12 +20,6 @@
<property name="src.dtd.dir" value="${src.dir}/dtd"/>
<property name="final.name" value="${project}-${version}"/>
<property name="final.dir" value="../${final.name}/"/>
- <property name="year" value="1999-2001"/>
- <property name="debug" value="on"/>
- <property name="optimize" value="off"/>
- <property name="deprecation" value="off"/>
-
- <property name="jdom.jar" value="jdom-b6.jar"/>
<!-- Build classpath -->
<path id="classpath">
@@ -59,10 +53,6 @@
classname="javax.servlet.jsp.PageContext">
<classpath refid="classpath"/>
</available>
- <available property="junit.present"
- classname="junit.framework.TestCase">
- <classpath refid="classpath"/>
- </available>
<available property="freemarker.present"
classname="freemarker.template.Template">
<classpath refid="classpath"/>
@@ -140,15 +130,6 @@
</target>
<!-- ================================================================== -->
- <!-- Adds testcase files to the build directory -->
- <!-- ================================================================== -->
- <target name="prepare-tests" depends="prepare" if="junit.present">
- <copy todir="${build.src}/org" filtering="yes">
- <fileset dir="${src.test.dir}/org"/>
- </copy>
- </target>
-
- <!-- ================================================================== -->
<!-- Adds castor files to the build directory -->
<!-- ================================================================== -->
<target name="prepare-castor" depends="prepare" if="castor.present">
@@ -298,51 +279,6 @@
</target>
<!-- ================================================================== -->
- <!-- Compile testcases -->
- <!-- ================================================================== -->
- <target name="compile-tests" depends="prepare-tests, compile"
- if="junit.present"/>
-
- <!-- ================================================================== -->
- <!-- Run testcases -->
- <!-- ================================================================== -->
- <target name="run-tests" depends="compile-tests" if="junit.present"
- description="--> runs all available testcases">
- <junit printsummary="no" haltonfailure="yes">
- <classpath>
- <pathelement location="${build.dest}"/>
- <path refid="classpath"/>
- <pathelement path="${classpath}"/>
- </classpath>
-
- <formatter type="plain" usefile="false"/>
-
- <batchtest>
- <fileset dir="${build.src}">
- <include name="**/*Test.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <!-- ================================================================== -->
- <!-- Run an single testcase -->
- <!-- ================================================================== -->
- <target name="run-singletest" if="testcase" depends="compile-tests">
- <junit printsummary="no" haltonfailure="yes">
- <classpath>
- <pathelement location="${build.dest}"/>
- <path refid="classpath" />
- <pathelement path="${classpath}"/>
- </classpath>
-
- <formatter type="plain" usefile="false"/>
-
- <test name="${testcase}"/>
- </junit>
- </target>
-
- <!-- ================================================================== -->
<!-- Create torque.jar for stand-alone use outside the context -->
<!-- of the TDK. -->
<!-- ================================================================== -->
@@ -351,6 +287,17 @@
description="--> generates the torque distribution">
<ant antfile="build-torque.xml">
<property name="build.dir" value="${build.dir}"/>
+ </ant>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- T E S T S -->
+ <!-- ================================================================== -->
+ <target name="test" depends="compile"
+ description="--> runs turbine unit tests">
+
+ <ant antfile="build-test.xml">
+ <property file="build.properties"/>
</ant>
</target>
1.1 jakarta-turbine/build/build-test.xml
Index: build-test.xml
===================================================================
<project name="turbine-tests" default="run-tests" basedir=".">
<!-- Build classpath -->
<path id="classpath">
<fileset dir="${turbine.jars}">
<include name="**/*.jar"/>
</fileset>
</path>
<target name="prepare">
<available property="junit.present"
classname="junit.framework.TestCase">
<classpath refid="classpath"/>
</available>
<copy todir="${build.src}/org" filtering="yes">
<fileset dir="${src.test.dir}/org"/>
</copy>
<javac srcdir="${build.src}"
destdir="${build.dest}"
excludes="**/package.html"
debug="${debug}"
deprecation="${deprecation}"
optimize="${optimize}">
<classpath refid="classpath"/>
</javac>
</target>
<!-- ================================================================== -->
<!-- Run testcases -->
<!-- ================================================================== -->
<target name="run-tests" depends="prepare" if="junit.present"
description="--> runs all available testcases">
<junit printsummary="no" haltonfailure="yes">
<classpath>
<pathelement location="${build.dest}"/>
<path refid="classpath"/>
<pathelement path="${classpath}"/>
</classpath>
<formatter type="plain" usefile="false"/>
<batchtest>
<fileset dir="${build.src}">
<include name="**/*Test.java"/>
</fileset>
</batchtest>
</junit>
</target>
<!-- ================================================================== -->
<!-- Run an single testcase -->
<!-- ================================================================== -->
<target name="run-singletest" if="testcase">
<junit printsummary="no" haltonfailure="yes">
<classpath>
<pathelement location="${build.dest}"/>
<path refid="classpath" />
<pathelement path="${classpath}"/>
</classpath>
<formatter type="plain" usefile="false"/>
<test name="${testcase}"/>
</junit>
</target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org