bodewig 2002/09/26 05:33:42
Modified: . Tag: ANT_15_BRANCH WHATSNEW build.xml
Log:
Don't run JUnitReportTest if the environment cannot deal with it.
Revision Changes Path
No revision
No revision
1.263.2.80 +4 -0 jakarta-ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
retrieving revision 1.263.2.79
retrieving revision 1.263.2.80
diff -u -r1.263.2.79 -r1.263.2.80
--- WHATSNEW 25 Sep 2002 15:30:29 -0000 1.263.2.79
+++ WHATSNEW 26 Sep 2002 12:33:42 -0000 1.263.2.80
@@ -3,7 +3,11 @@
Fixed bugs:
-----------
+
* <tstamp>'s prefix attribute failed to apply to nested <format> elements.
+
+* <junitreport> created an empty junit-noframes.html if no format had
+ been specified.
Other changes:
--------------
1.304.2.33 +12 -0 jakarta-ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/build.xml,v
retrieving revision 1.304.2.32
retrieving revision 1.304.2.33
diff -u -r1.304.2.32 -r1.304.2.33
--- build.xml 4 Sep 2002 11:21:11 -0000 1.304.2.32
+++ build.xml 26 Sep 2002 12:33:42 -0000 1.304.2.33
@@ -1233,6 +1233,16 @@
<target name="run-tests" depends="dump-info,compile-tests,probe-offline"
if="junit.present">
+ <condition property="run.junitreport">
+ <or>
+ <isset property="xalan2.present"/>
+ <and>
+ <isset property="xalan.present"/>
+ <isset property="bsf.present"/>
+ </and>
+ </or>
+ </condition>
+
<junit printsummary="${junit.summary}" haltonfailure="yes"
filtertrace="${junit.filtertrace}"
fork="${junit.fork}">
@@ -1312,6 +1322,8 @@
unless="trax.impl.present"/>
<exclude name="${ant.package}/types/XMLCatalogBuildFileTest.java"
unless="trax.impl.present"/>
+ <exclude name="${optional.package}/junit/JUnitReportTest.java"
+ unless="run.junitreport"/>
<!-- needs BSF to work -->
<exclude name="${optional.package}/XalanLiaisonTest.java"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
