Browse Source

make AntUnit tests use a temp-dir inside the build tree rather than

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1301337 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 13 years ago
parent
commit
1c63fba0bc
2 changed files with 14 additions and 9 deletions
  1. +4
    -0
      build.xml
  2. +10
    -9
      src/tests/antunit/antunit-base.xml

+ 4
- 0
build.xml View File

@@ -85,6 +85,7 @@
<property name="build.tests.javadocs" value="${build.dir}/javadocs.test/"/>
<property name="build.junit.xml" location="${build.tests}/xml"/>
<property name="antunit.xml" location="${build.dir}/antunit/xml"/>
<property name="antunit.tmpdir" location="${build.dir}/antunit/tmp"/>
<property name="antunit.reports" location="${build.dir}/antunit/reports"/>
<property name="antunit.loglevel" value="none"/>
<property name="build.junit.reports" location="${build.tests}/reports"/>
@@ -1948,6 +1949,9 @@ see ${build.junit.reports} / ${antunit.reports}
excludes="${antunit.excludes}" />
<au:plainlistener logLevel="${antunit.loglevel}"/>
<au:xmllistener todir="${antunit.xml}" />
<propertyset>
<propertyref name="antunit.tmpdir"/>
</propertyset>
</au:antunit>
</target>



+ 10
- 9
src/tests/antunit/antunit-base.xml View File

@@ -17,15 +17,16 @@
-->
<project name="antunit-base">

<property name="input" location="${java.io.tmpdir}/testinput"/>
<property name="output" location="${java.io.tmpdir}/testoutput"/>
<property name="resources" location="${java.io.tmpdir}/resources"/>
<property name="test.jar" location="${java.io.tmpdir}/test.jar"/>
<property name="test1.jar" location="${java.io.tmpdir}/test1.jar"/>
<property name="test2.jar" location="${java.io.tmpdir}/test2.jar"/>
<property name="test3.jar" location="${java.io.tmpdir}/test3.jar"/>
<property name="test4.jar" location="${java.io.tmpdir}/test4.jar"/>
<property name="test5.jar" location="${java.io.tmpdir}/test5.jar"/>
<property name="antunit.tmpdir" location="${java.io.tmpdir}"/>
<property name="input" location="${antunit.tmpdir}/testinput"/>
<property name="output" location="${antunit.tmpdir}/testoutput"/>
<property name="resources" location="${antunit.tmpdir}/resources"/>
<property name="test.jar" location="${antunit.tmpdir}/test.jar"/>
<property name="test1.jar" location="${antunit.tmpdir}/test1.jar"/>
<property name="test2.jar" location="${antunit.tmpdir}/test2.jar"/>
<property name="test3.jar" location="${antunit.tmpdir}/test3.jar"/>
<property name="test4.jar" location="${antunit.tmpdir}/test4.jar"/>
<property name="test5.jar" location="${antunit.tmpdir}/test5.jar"/>
<available property="jdk1.8+" classname="java.lang.reflect.Executable"/>
<available property="jdk1.7+" classname="java.nio.file.FileSystem"/>
<available property="jdk1.6+" classname="java.net.CookieStore"/>


Loading…
Cancel
Save