stevel 02/02/10 14:29:48
Modified: . build.xml
Log:
small changes to the tests
-option to control summary printouts
-JavaTest is excluded from the bulk test
-the test classpath is turned into a property and passed down to the tests
(and hence on to the build files themselves)
-description for single test added
Revision Changes Path
1.241 +20 -5 jakarta-ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/build.xml,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- build.xml 9 Feb 2002 22:55:38 -0000 1.240
+++ build.xml 10 Feb 2002 22:29:48 -0000 1.241
@@ -26,6 +26,7 @@
<property name="optimize" value="true" />
<property name="junit.fork" value="false" />
<property name="junit.filtertrace" value="off"/>
+ <property name="junit.summary" value="no"/>
<!--
===================================================================
@@ -76,6 +77,9 @@
<pathelement location="${tests.etc.dir}"/>
<path refid="classpath" />
</path>
+<!-- turn this path into a string which is passed to the tests -->
+ <property name="tests-classpath.value"
+ refid="tests-classpath"/>
<!--
===================================================================
@@ -900,8 +904,7 @@
<target name="run-tests" depends="dump-info,compile-tests"
if="junit.present">
-
- <junit printsummary="no" haltonfailure="yes"
+ <junit printsummary="${junit.summary}" haltonfailure="yes"
filtertrace="${junit.filtertrace}"
fork="${junit.fork}">
<!-- <jvmarg value="-classic"/> -->
@@ -910,6 +913,8 @@
<sysproperty key="ant.home" value="${ant.home}" />
<sysproperty key="build.tests" value="${build.tests}"/>
<sysproperty key="java.home" value="${java.home}" />
+ <sysproperty key="tests-classpath.value"
+ value="${tests-classpath.value}" />
<formatter type="brief" usefile="false" />
@@ -973,20 +978,30 @@
<exclude name="${optional.package}/sos/SOSTest.java"
unless="tests.and.ant.share.classloader" />
+ <!-- failure of this test case kills the current JVM
+ so until the defect is actually fixed it is taken
+ out of the test list -->
+ <exclude name="org/apache/tools/ant/taskdefs/JavaTest.java" />
</fileset>
</batchtest>
</junit>
</target>
- <target name="run-single-test" if="testcase" depends="compile-tests">
+ <target name="run-single-test" if="testcase" depends="compile-tests"
+ description="--> runs the single unit test defined in the testcase
property">
+
- <junit printsummary="no" haltonfailure="yes" fork="${junit.fork}"
- filtertrace="${junit.filtertrace}">
+ <junit printsummary="${junit.summary}"
+ haltonfailure="yes"
+ fork="${junit.fork}"
+ filtertrace="${junit.filtertrace}">
<!-- <jvmarg value="-classic"/> -->
<sysproperty key="ant.home" value="${ant.home}" />
<sysproperty key="build.tests" value="${build.tests}"/>
<sysproperty key="java.home" value="${java.home}" />
+ <sysproperty key="tests-classpath.value"
+ value="${tests-classpath.value}" />
<classpath location="${java.home}/lib/classes.zip" />
<classpath refid="tests-classpath"/>
<formatter type="plain" usefile="false" />
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
