rwaldhoff 01/04/03 22:26:37 Modified: pool build.xml build.properties.sample Log: making dependency on JUnit jar explict using <java> rather than <junit> to invoke tests Revision Changes Path 1.2 +23 -10 jakarta-commons-sandbox/pool/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/pool/build.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- build.xml 2001/04/03 17:23:21 1.1 +++ build.xml 2001/04/04 05:26:37 1.2 @@ -1,4 +1,4 @@ -<!-- $Id: build.xml,v 1.1 2001/04/03 17:23:21 rwaldhoff Exp $ --> +<!-- $Id: build.xml,v 1.2 2001/04/04 05:26:37 rwaldhoff Exp $ --> <project name="jakarta-commons-pool" default="test" basedir="."> <!-- patternset describing files to be copied from the doc directory --> @@ -37,13 +37,15 @@ <property name="cp" value=""/> <!-- now combine the classpaths --> - <property name="classpath" value="${cp}:${user-classpath}:${commons-collections.jar}"/> + <property name="classpath" value="${cp}:${user-classpath}:${commons-collections.jar}:${junit.jar}"/> <property name="name" value="commons-pool"/> <property name="Name" value="Commons-Pool"/> <property name="Name-Long" value="Jakarta Commons Object Pooling Package"/> <property name="test.entry" value="org.apache.commons.pool.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}"/> @@ -165,15 +167,26 @@ <!-- ######################################################### --> <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}"/> - <classpath> - <pathelement location="${dest.classes}" /> - <pathelement path="${classpath}" /> - <pathelement path="${java.class.path}" /> - </classpath> + <formatter type="plain" usefile="false"/> + <test name="${test.entry}"/> + <classpath> + <pathelement location="${dest.classes}" /> + <pathelement path="${classpath}" /> + <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.2 +2 -1 jakarta-commons-sandbox/pool/build.properties.sample Index: build.properties.sample =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/pool/build.properties.sample,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- build.properties.sample 2001/04/03 17:23:21 1.1 +++ build.properties.sample 2001/04/04 05:26:37 1.2 @@ -1,3 +1,4 @@ # commons-collections.jar - Commons-Collections Classpath commons-collections.jar=${basedir}/../collections/build/commons-collections.jar - +# junit.jar - JUnit 3.2+ Classpath +junit.jar=/java/junit/junit.jar \ No newline at end of file