From 4205adcb7e31ca842f3fe96c41c9f569050052c4 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Mon, 31 Mar 2014 11:12:30 +0000
Subject: [PATCH] zip test wasn't cleaning up properly - and
 testDefaultExcludesAndUpdate errored out

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1583299 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/testcases/taskdefs/zip.xml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/etc/testcases/taskdefs/zip.xml b/src/etc/testcases/taskdefs/zip.xml
index ee51fd5d6..ae6e3d0eb 100644
--- a/src/etc/testcases/taskdefs/zip.xml
+++ b/src/etc/testcases/taskdefs/zip.xml
@@ -49,7 +49,7 @@
   -->
 
   <target name="test5">
-    <zip zipfile="test5.zip" basedir="." >
+    <zip zipfile="${output}/test5.zip" basedir="." >
       <exclude name="test5.zip" />
     </zip>
   </target>
@@ -136,9 +136,9 @@
 
   <!-- Bugzilla Report 19449 -->
   <target name="testFilesOnlyDoesntCauseRecreateSetup">
-    <mkdir dir="ziptest"/>
-    <touch file="ziptest/ziptest"/>
-    <zip destFile="${output}/test3.zip" basedir="."
+    <mkdir dir="${output}/ziptest"/>
+    <touch file="${output}/ziptest/ziptest"/>
+    <zip destFile="${output}/test3.zip" basedir="${output}"
          includes="ziptest/**" filesonly="true"/>
   </target>
 
@@ -161,8 +161,8 @@
 
   <!-- Bugzilla Report 30365 -->
   <target name="zipEmptyDir">
-    <mkdir dir="empty/empty2"/>
-    <zip destFile="${output}/test3.zip" basedir="empty" update="true"/>
+    <mkdir dir="${output}/empty/empty2"/>
+    <zip destFile="${output}/test3.zip" basedir="${output}/empty" update="true"/>
     <fail message="single-directory archive should be created">
       <condition>
         <or>
@@ -185,8 +185,8 @@
 
   <!-- Bugzilla Report 40258 -->
   <target name="zipEmptyDirFilesOnly">
-    <mkdir dir="empty/empty2" />
-    <zip destFile="${output}/test3.zip" basedir="empty" update="true" filesonly="true" />
+    <mkdir dir="${output}/empty/empty2" />
+    <zip destFile="${output}/test3.zip" basedir="${output}/empty" update="true" filesonly="true" />
     <fail message="archive should get skipped">
       <condition>
         <available file="${output}/test3.zip" />
@@ -195,8 +195,8 @@
   </target>
 
   <target name="zipEmptyCreate">
-    <mkdir dir="empty"/>
-    <zip destFile="${output}/test3.zip" basedir="empty" whenempty="create" includes="*.xyz"/>
+    <mkdir dir="${output}/empty"/>
+    <zip destFile="${output}/test3.zip" basedir="${output}/empty" whenempty="create" includes="*.xyz"/>
     <fail message="empty archive should be created">
       <condition>
         <or>
@@ -237,7 +237,8 @@
   <target name="testDefaultExcludesAndUpdate">
     <mkdir dir="${output}/ziptest"/>
     <touch file="${output}/ziptest/ziptest~"/>
-    <zip destFile="${output}/test3.zip" basedir="ziptest" defaultexcludes="false"/>
+    <zip destFile="${output}/test3.zip" basedir="${output}/ziptest"
+         defaultexcludes="false"/>
     <touch file="${output}/ziptest/ziptest2"/>
     <zip destFile="${output}/test3.zip" basedir="${output}/ziptest"
       defaultexcludes="false"