Author: stevel
Date: Wed Mar 1 07:31:57 2006
New Revision: 382055
URL: http://svn.apache.org/viewcvs?rev=382055&view=rev
Log:
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.
Modified:
ant/core/trunk/build.xml
Modified: ant/core/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/ant/core/trunk/build.xml?rev=382055&r1=382054&r2=382055&view=diff
==============================================================================
--- ant/core/trunk/build.xml (original)
+++ ant/core/trunk/build.xml Wed Mar 1 07:31:57 2006
@@ -90,6 +90,8 @@
<property name="build.javadocs" value="${build.dir}/javadocs"/>
<property name="build.tests" value="${build.dir}/testcases"/>
<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"/>
<!-- the absolute path -->
<property name="build.tests.value" location="${build.tests}"/>
@@ -1589,6 +1591,8 @@
<target name="test-init" depends="probe-offline">
+ <mkdir dir="${build.tests.xml}"/>
+ <mkdir dir="${build.tests.reports}" />
<presetdef name="test-junit">
<junit printsummary="${junit.summary}"
@@ -1596,8 +1600,8 @@
fork="${junit.fork}"
failureproperty="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="build.tests" file="${build.tests}"/>
<sysproperty key="build.tests.value" value="${build.tests.value}"/>
@@ -1618,16 +1622,16 @@
<!--if="run.junitreport"-->
<target name="test-report" depends="test-init,run-tests,run-single-test"
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"/>
</fileset>
- <report format="frames" todir="${build.tests}"/>
+ <report format="frames" todir="${build.tests.reports}"/>
</junitreport>
</target>
<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>
@@ -1642,7 +1646,7 @@
<test-junit >
<formatter type="brief" usefile="false"/>
- <batchtest>
+ <batchtest todir="${build.tests.xml}">
<fileset dir="${tests.dir}"
includes="${includetests}" excludes="${excludetests}">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
