From de0fc904c5a68e1af2c02ae64fa0c7e9f5f9699c Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Tue, 2 Mar 2010 11:03:41 +0000
Subject: [PATCH] allow AntUnit tests to pass on Windows even if the created
 jar cannot be deleted.  This will likely leave test.jar lying around in $TEMP
 on Windows.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@917956 13f79535-47bb-0310-9956-ffa450edef68
---
 src/tests/antunit/taskdefs/import-url-test.xml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/tests/antunit/taskdefs/import-url-test.xml b/src/tests/antunit/taskdefs/import-url-test.xml
index ab4f0d495..0d4bb3247 100644
--- a/src/tests/antunit/taskdefs/import-url-test.xml
+++ b/src/tests/antunit/taskdefs/import-url-test.xml
@@ -40,15 +40,15 @@
   <echo file="${input}/a/c/test.properties"><![CDATA[
 foo=bar
 ]]></echo>
-  <mkdir dir="${output}"/>
-  <jar destfile="${output}/test.jar">
+  <property name="test.jar" location="${java.io.tmpdir}/test.jar"/>
+  <jar destfile="${test.jar}">
     <fileset dir="${input}"/>
   </jar>
   <delete dir="${input}"/>
 
   <import>
     <javaresource name="a/b/outer.xml">
-      <classpath location="${output}/test.jar"/>
+      <classpath location="${test.jar}"/>
     </javaresource>
   </import>
 
@@ -58,15 +58,14 @@ foo=bar
     <au:assertLogContains text="foo is bar"/>
   </target>
 
-  <target name="tearDown" depends="close, antunit-base.tearDown"/>
-
-  <target name="close">
+  <target name="tearDown" depends="antunit-base.tearDown">
     <taskdef name="close"
              classname="org.apache.tools.ant.taskdefs.CloseResources"/>
     <close>
       <javaresource name="a/b/outer.xml">
-        <classpath location="${output}/test.jar"/>
+        <classpath location="${test.jar}"/>
       </javaresource>
     </close>
+    <delete file="${test.jar}" quiet="true" deleteonexit="true"/>
   </target>
 </project>