Browse Source

conditionally exclude JUnitReportTest

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273364 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 22 years ago
parent
commit
d928ea97f2
2 changed files with 15 additions and 0 deletions
  1. +3
    -0
      WHATSNEW
  2. +12
    -0
      build.xml

+ 3
- 0
WHATSNEW View File

@@ -34,6 +34,9 @@ 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:
--------------



+ 12
- 0
build.xml View File

@@ -1245,6 +1245,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}">
@@ -1325,6 +1335,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"


Loading…
Cancel
Save