Browse Source

Use a local temp directory for JUnit tests as well

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1301870 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 13 years ago
parent
commit
8cab09b51c
2 changed files with 3 additions and 1 deletions
  1. +2
    -0
      build.xml
  2. +1
    -1
      src/tests/antunit/taskdefs/optional/unix/symlink-test.xml

+ 2
- 0
build.xml View File

@@ -84,6 +84,7 @@
<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.junit.xml" location="${build.tests}/xml"/> <property name="build.junit.xml" location="${build.tests}/xml"/>
<property name="build.junit.tmpdir" location="${build.tests}/tmp"/>
<property name="antunit.xml" location="${build.dir}/antunit/xml"/> <property name="antunit.xml" location="${build.dir}/antunit/xml"/>
<property name="antunit.tmpdir" location="${build.dir}/antunit/tmp"/> <property name="antunit.tmpdir" location="${build.dir}/antunit/tmp"/>
<property name="antunit.reports" location="${build.dir}/antunit/reports"/> <property name="antunit.reports" location="${build.dir}/antunit/reports"/>
@@ -1664,6 +1665,7 @@ see ${build.junit.reports} / ${antunit.reports}
<sysproperty key="build.compiler" value="${build.compiler}"/> <sysproperty key="build.compiler" value="${build.compiler}"/>
<sysproperty key="tests.and.ant.share.classloader" <sysproperty key="tests.and.ant.share.classloader"
value="${tests.and.ant.share.classloader}"/> value="${tests.and.ant.share.classloader}"/>
<sysproperty key="java.io.tmpdir" file="${build.junit.tmpdir}"/>
<classpath> <classpath>
<path refid="tests-runtime-classpath"/> <path refid="tests-runtime-classpath"/>
<pathelement location="${junit.collector.dir}"/> <pathelement location="${junit.collector.dir}"/>


+ 1
- 1
src/tests/antunit/taskdefs/optional/unix/symlink-test.xml View File

@@ -84,7 +84,7 @@
<target name="testDeleteWithNoPermissionToRenameTarget" <target name="testDeleteWithNoPermissionToRenameTarget"
depends="init" if="unix"> depends="init" if="unix">
<!-- must be outside of ${output} or "base" tearDown will fail --> <!-- must be outside of ${output} or "base" tearDown will fail -->
<property name="chmod.tmp" location="${java.io.tmpdir}/ant-symlink-test"/>
<property name="chmod.tmp" location="${output}/../ant-symlink-test"/>
<mkdir dir="${chmod.tmp}/A"/> <mkdir dir="${chmod.tmp}/A"/>
<chmod perm="555" dir="${chmod.tmp}"/> <chmod perm="555" dir="${chmod.tmp}"/>
<symlink link="${output}/link" resource="${chmod.tmp}/A"/> <symlink link="${output}/link" resource="${chmod.tmp}/A"/>


Loading…
Cancel
Save