rwaldhoff 01/04/03 22:21:16
Modified: collections build.xml
Added: collections build.properties.sample
Log:
making dependency on JUnit jar explict
using <java> rather than <junit> to invoke tests
Revision Changes Path
1.2 +18 -5 jakarta-commons-sandbox/collections/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/collections/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2001/04/03 17:11:56 1.1
+++ build.xml 2001/04/04 05:21:15 1.2
@@ -1,4 +1,4 @@
-<!-- $Id: build.xml,v 1.1 2001/04/03 17:11:56 rwaldhoff Exp $ -->
+<!-- $Id: build.xml,v 1.2 2001/04/04 05:21:15 rwaldhoff Exp $ -->
<project name="commons-collections" default="test" basedir=".">
<!-- patternset describing files to be copied from the doc directory -->
@@ -37,14 +37,16 @@
<property name="cp" value=""/>
<!-- now combine the classpaths -->
- <property name="classpath" value="${cp}:${user-classpath}"/>
+ <property name="classpath" value="${cp}:${user-classpath}:${junit.jar}"/>
<property name="name" value="commons-collections"/>
<property name="Name" value="Commons-Collections"/>
<property name="Name-Long" value="Jakarta Commons Collections Package"/>
<property name="test.entry" value="org.apache.commons.collections.TestAll"/>
-
+ <property name="test.failonerror" value="true" />
+ <property name="test.runner" value="junit.textui.TestRunner" />
+
<property name="workdir"
value="${java.io.tmpdir}/buildtemp_${DSTAMP}${TSTAMP}"/>
<property name="source" value="${basedir}"/>
<property name="source.src" value="${basedir}/src"/>
@@ -57,7 +59,7 @@
<property name="dest.jardir.jar" value="${dest.jardir}/${name}.jar"/>
<available property="available-doc" file="${source.doc}"/> <!-- does this
module have docs? -->
- <available property="available-src" file="${source.src}"/> <!-- does this
module have src? -->
+ <available property="available-src" file="${source.src}"/> <!-- does this
module have src? -->
</target>
@@ -165,6 +167,7 @@
<!-- ######################################################### -->
<target name="test" depends="build" if="test.entry" description="runs (junit)
unit tests">
+ <!--
<junit printsummary="yes" fork="on" haltonfailure="yes">
<formatter type="plain" usefile="false"/>
<test name="${test.entry}"/>
@@ -174,6 +177,16 @@
<pathelement path="${java.class.path}" />
</classpath>
</junit>
+ -->
+
+ <java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
+ <arg value="${test.entry}"/>
+ <classpath>
+ <pathelement location="${dest.classes}" />
+ <pathelement path="${classpath}" />
+ <pathelement path="${java.class.path}" />
+ </classpath>
+ </java>
</target>
<!-- ######################################################### -->
@@ -196,4 +209,4 @@
<!-- ######################################################### -->
-</project>
+</project>
\ No newline at end of file
1.1 jakarta-commons-sandbox/collections/build.properties.sample
Index: build.properties.sample
===================================================================
# junit.jar - JUnit 3.2+ Classpath
junit.jar=/java/junit/junit.jar
