Browse Source

move jars that are created during tests but cannot be deleted to a directory inside the build dir rather than java.io.tmpdir

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1002462 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 14 years ago
parent
commit
f632659d10
2 changed files with 7 additions and 5 deletions
  1. BIN
      lib/optional/junit-4.8.1.jar
  2. +7
    -5
      src/tests/antunit/taskdefs/taskdef-test.xml

BIN
lib/optional/junit-4.8.1.jar View File


+ 7
- 5
src/tests/antunit/taskdefs/taskdef-test.xml View File

@@ -20,6 +20,8 @@


<target name="setUp"> <target name="setUp">
<mkdir dir="${input}/org/example"/> <mkdir dir="${input}/org/example"/>
<property name="tmpdir" location="../../../../build/ant-unit/taskdef"/>
<mkdir dir="${tmpdir}"/>
<echoxml file="${input}/org/example/antlib.xml"> <echoxml file="${input}/org/example/antlib.xml">
<antlib> <antlib>
<taskdef name="echooo" <taskdef name="echooo"
@@ -30,7 +32,7 @@


<target name="testPlainDir" depends="setUp"> <target name="testPlainDir" depends="setUp">
<tempfile property="jar" deleteonexit="true" <tempfile property="jar" deleteonexit="true"
destdir="${java.io.tmpdir}" prefix="test" suffix=".jar"/>
destdir="${tmpdir}" prefix="test" suffix=".jar"/>
<jar destfile="${jar}"> <jar destfile="${jar}">
<fileset dir="${input}"/> <fileset dir="${input}"/>
</jar> </jar>
@@ -43,7 +45,7 @@


<target name="testDirWithPling" depends="setUp" <target name="testDirWithPling" depends="setUp"
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=50007"> description="https://issues.apache.org/bugzilla/show_bug.cgi?id=50007">
<property name="dir" location="${java.io.tmpdir}/pl!ng"/>
<property name="dir" location="${tmpdir}/pl!ng"/>
<mkdir dir="${dir}"/> <mkdir dir="${dir}"/>
<tempfile property="jar" deleteonexit="true" destdir="${dir}" <tempfile property="jar" deleteonexit="true" destdir="${dir}"
prefix="test" suffix=".jar"/> prefix="test" suffix=".jar"/>
@@ -61,7 +63,7 @@
by ClassLoader.getResources() --> by ClassLoader.getResources() -->
<target name="NOtestDirWithPlingAtEnd" depends="setUp" <target name="NOtestDirWithPlingAtEnd" depends="setUp"
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=50007"> description="https://issues.apache.org/bugzilla/show_bug.cgi?id=50007">
<property name="dir" location="${java.io.tmpdir}/pling!"/>
<property name="dir" location="${tmpdir}/pling!"/>
<mkdir dir="${dir}"/> <mkdir dir="${dir}"/>
<tempfile property="jar" deleteonexit="true" destdir="${dir}" <tempfile property="jar" deleteonexit="true" destdir="${dir}"
prefix="test" suffix=".jar"/> prefix="test" suffix=".jar"/>
@@ -77,7 +79,7 @@


<target name="testPlingInJar" depends="setUp"> <target name="testPlingInJar" depends="setUp">
<tempfile property="jar" deleteonexit="true" <tempfile property="jar" deleteonexit="true"
destdir="${java.io.tmpdir}" prefix="test" suffix=".jar"/>
destdir="${tmpdir}" prefix="test" suffix=".jar"/>
<move file="${input}/org/example/antlib.xml" <move file="${input}/org/example/antlib.xml"
tofile="${input}/org/examp!e/antlib.xml"/> tofile="${input}/org/examp!e/antlib.xml"/>
<jar destfile="${jar}"> <jar destfile="${jar}">
@@ -92,7 +94,7 @@


<target name="testPlingInJarAtEnd" depends="setUp"> <target name="testPlingInJarAtEnd" depends="setUp">
<tempfile property="jar" deleteonexit="true" <tempfile property="jar" deleteonexit="true"
destdir="${java.io.tmpdir}" prefix="test" suffix=".jar"/>
destdir="${tmpdir}" prefix="test" suffix=".jar"/>
<move file="${input}/org/example/antlib.xml" <move file="${input}/org/example/antlib.xml"
tofile="${input}/org/example!/antlib.xml"/> tofile="${input}/org/example!/antlib.xml"/>
<jar destfile="${jar}"> <jar destfile="${jar}">


Loading…
Cancel
Save