Browse Source

let's not save XML reports to the project dir, but instead somewhere under build/ and stick the results in a directory parallel to it.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@382055 13f79535-47bb-0310-9956-ffa450edef68
master
Steve Loughran 19 years ago
parent
commit
9b64de2c15
1 changed files with 11 additions and 7 deletions
  1. +11
    -7
      build.xml

+ 11
- 7
build.xml View File

@@ -90,6 +90,8 @@
<property name="build.javadocs" value="${build.dir}/javadocs"/> <property name="build.javadocs" value="${build.dir}/javadocs"/>
<property name="build.tests" value="${build.dir}/testcases"/> <property name="build.tests" value="${build.dir}/testcases"/>
<property name="build.tests.javadocs" value="${build.dir}/javadocs.test/"/> <property name="build.tests.javadocs" value="${build.dir}/javadocs.test/"/>
<property name="build.tests.xml" location="${build.tests}/xml"/>
<property name="build.tests.reports" location="${build.tests}/reports"/>
<property name="manifest.tmp" value="${build.dir}/optional.manifest"/> <property name="manifest.tmp" value="${build.dir}/optional.manifest"/>
<!-- the absolute path --> <!-- the absolute path -->
<property name="build.tests.value" location="${build.tests}"/> <property name="build.tests.value" location="${build.tests}"/>
@@ -1589,6 +1591,8 @@




<target name="test-init" depends="probe-offline"> <target name="test-init" depends="probe-offline">
<mkdir dir="${build.tests.xml}"/>
<mkdir dir="${build.tests.reports}" />


<presetdef name="test-junit"> <presetdef name="test-junit">
<junit printsummary="${junit.summary}" <junit printsummary="${junit.summary}"
@@ -1596,8 +1600,8 @@
fork="${junit.fork}" fork="${junit.fork}"
failureproperty="tests.failed" failureproperty="tests.failed"
errorproperty="tests.failed" errorproperty="tests.failed"
filtertrace="${junit.filtertrace}">
<!-- <jvmarg value="-classic"/> -->
filtertrace="${junit.filtertrace}"
dir="${build.tests.xml}">
<sysproperty key="ant.home" value="${ant.home}"/> <sysproperty key="ant.home" value="${ant.home}"/>
<sysproperty key="build.tests" file="${build.tests}"/> <sysproperty key="build.tests" file="${build.tests}"/>
<sysproperty key="build.tests.value" value="${build.tests.value}"/> <sysproperty key="build.tests.value" value="${build.tests.value}"/>
@@ -1618,16 +1622,16 @@
<!--if="run.junitreport"--> <!--if="run.junitreport"-->
<target name="test-report" depends="test-init,run-tests,run-single-test" <target name="test-report" depends="test-init,run-tests,run-single-test"
if="trax.impl.present"> if="trax.impl.present">
<junitreport todir="${build.tests}">
<fileset dir="${build.tests}">
<junitreport todir="${build.tests.reports}">
<fileset dir="${build.tests.xml}">
<include name="TEST-*.xml"/> <include name="TEST-*.xml"/>
</fileset> </fileset>
<report format="frames" todir="${build.tests}"/>
<report format="frames" todir="${build.tests.reports}"/>
</junitreport> </junitreport>
</target> </target>


<target name="test-halt" depends="test-report" > <target name="test-halt" depends="test-report" >
<fail if="tests.failed">Unit tests failed</fail>
<fail if="tests.failed">Unit tests failed see ${build.tests.reports}</fail>
</target> </target>




@@ -1642,7 +1646,7 @@
<test-junit > <test-junit >
<formatter type="brief" usefile="false"/> <formatter type="brief" usefile="false"/>


<batchtest>
<batchtest todir="${build.tests.xml}">
<fileset dir="${tests.dir}" <fileset dir="${tests.dir}"
includes="${includetests}" excludes="${excludetests}"> includes="${includetests}" excludes="${excludetests}">




Loading…
Cancel
Save