From 1f15ad0db403d9eeeadd2378851792090dcf9dc8 Mon Sep 17 00:00:00 2001
From: George Bateman <george.bateman16@gmail.com>
Date: Tue, 26 Sep 2017 22:43:28 +0100
Subject: [PATCH] Fix zip-test

---
 src/tests/antunit/taskdefs/zip-test.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/tests/antunit/taskdefs/zip-test.xml b/src/tests/antunit/taskdefs/zip-test.xml
index c2dfbe34b..7ff45c1ad 100644
--- a/src/tests/antunit/taskdefs/zip-test.xml
+++ b/src/tests/antunit/taskdefs/zip-test.xml
@@ -185,19 +185,19 @@
 
     <target name="testSetZipModTime">
       <mkdir dir="${input}/"/>
+      <mkdir dir="${input}/subdir"/>
       <touch file="${input}/test1.txt"/>
+      <touch file="${input}/subdir/test2.txt"/>
       <mkdir dir="${output}"/>
-      <zip destfile="${output}/test.zip" basedir="${input}" modificationtime="2016-01-01 00:00">
-        <fileset dir="${input}"/>
-      </zip>
+      <zip destfile="${output}/test.zip" basedir="${input}" modificationtime="2016-01-01 00:00" />
       <checksum file="${output}/test.zip" property="testSetZipModTime_hash" />
       <delete file="${output}/test.zip" />
 
+      <sleep seconds="4" /> <!-- Necessary to ensure zips would have normally differed in timestamp -->
       <touch file="${input}/test1.txt"/>
-      <zip destfile="${output}/test.zip" basedir="${input}" modificationtime="2016-01-01 00:00">
-        <fileset dir="${input}"/>
-      </zip>
-      <checksum file="${output}/test.zip" property="testSetZipModTime_hash" verifyproperty="testSetZipModTime_okay" />
+      <touch file="${input}/subdir/test2.txt"/>
+      <zip destfile="${output}/test.zip" basedir="${input}" modificationtime="2016-01-01 00:00" />
+      <checksum file="${output}/test.zip" property="${testSetZipModTime_hash}" verifyproperty="testSetZipModTime_okay" />
       <au:assertTrue>
         <equals arg1="${testSetZipModTime_okay}" arg2="true" />
       </au:assertTrue>