You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2017/05/07 12:16:56 UTC

ant-antlibs-compress git commit: use test fix that worked for ar globally

Repository: ant-antlibs-compress
Updated Branches:
  refs/heads/master 5ba5470cf -> c673a2c0a


use test fix that worked for ar globally


Project: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/commit/c673a2c0
Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/tree/c673a2c0
Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/diff/c673a2c0

Branch: refs/heads/master
Commit: c673a2c0af548e20095b28decb9470d66c303c76
Parents: 5ba5470
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sun May 7 14:16:33 2017 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sun May 7 14:16:33 2017 +0200

----------------------------------------------------------------------
 src/tests/antunit/cpio-test.xml     | 10 +++++-----
 src/tests/antunit/sevenz-test.xml   | 10 +++++-----
 src/tests/antunit/tar-test.xml      | 10 +++++-----
 src/tests/antunit/zip-test.xml      | 10 +++++-----
 src/tests/antunit/zipentry-test.xml |  6 +++---
 5 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/c673a2c0/src/tests/antunit/cpio-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/cpio-test.xml b/src/tests/antunit/cpio-test.xml
index fde4f32..9cc9eea 100644
--- a/src/tests/antunit/cpio-test.xml
+++ b/src/tests/antunit/cpio-test.xml
@@ -22,7 +22,7 @@
 
   <import file="antunit-base.xml" />
 
-  <target name="setUp">
+  <target name="setUp" depends="-set-zip-ts-properties">
     <mkdir dir="${output}"/>
     <mkdir dir="${input}/subdir"/>
     <copy todir="${input}/subdir" file="../resources/asf-logo.gif"/>
@@ -84,8 +84,8 @@
       <zipfileset src="../resources/asf-logo.gif.zip"
                   includes="asf-logo.gif"/>
     </cmp:cpio>
-    <checkProperties dateTime="2001-11-19-15:34:20"
-                     pattern="yyyy-MM-dd-HH:mm:ss"
+    <checkProperties dateTime="${zip-ts-value}"
+                     pattern="${zip-ts-pattern}"
                      mode="644"/>
   </target>
 
@@ -94,8 +94,8 @@
       <cmp:zipfileset src="../resources/asf-logo.gif.zip"
                       includes="asf-logo.gif"/>
     </cmp:cpio>
-    <checkProperties dateTime="2001-11-19-15:34:20"
-                     pattern="yyyy-MM-dd-HH:mm:ss"
+    <checkProperties dateTime="${zip-ts-value}"
+                     pattern="${zip-ts-pattern}"
                      mode="644"/>
   </target>
 

http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/c673a2c0/src/tests/antunit/sevenz-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/sevenz-test.xml b/src/tests/antunit/sevenz-test.xml
index b74d003..c0751b7 100644
--- a/src/tests/antunit/sevenz-test.xml
+++ b/src/tests/antunit/sevenz-test.xml
@@ -22,7 +22,7 @@
 
   <import file="antunit-base.xml" />
 
-  <target name="setUp">
+  <target name="setUp" depends="-set-zip-ts-properties">
     <mkdir dir="${output}"/>
     <mkdir dir="${input}/subdir"/>
     <copy todir="${input}/subdir" file="../resources/asf-logo.gif"/>
@@ -60,8 +60,8 @@
       <zipfileset src="../resources/asf-logo.gif.zip"
                   includes="asf-logo.gif"/>
     </cmp:sevenz>
-    <checkProperties dateTime="2001-11-19-15:34:20"
-                     pattern="yyyy-MM-dd-HH:mm:ss"
+    <checkProperties dateTime="${zip-ts-value}"
+                     pattern="${zip-ts-pattern}"
                      />
   </target>
 
@@ -70,8 +70,8 @@
       <cmp:zipfileset src="../resources/asf-logo.gif.zip"
                       includes="asf-logo.gif"/>
     </cmp:sevenz>
-    <checkProperties dateTime="2001-11-19-15:34:20"
-                     pattern="yyyy-MM-dd-HH:mm:ss"
+    <checkProperties dateTime="${zip-ts-value}"
+                     pattern="${zip-ts-pattern}"
                      />
   </target>
 

http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/c673a2c0/src/tests/antunit/tar-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/tar-test.xml b/src/tests/antunit/tar-test.xml
index c8f5e06..9be498e 100644
--- a/src/tests/antunit/tar-test.xml
+++ b/src/tests/antunit/tar-test.xml
@@ -22,7 +22,7 @@
 
   <import file="antunit-base.xml" />
 
-  <target name="setUp">
+  <target name="setUp" depends="-set-zip-ts-properties">
     <mkdir dir="${output}"/>
     <property name="dest" location="${output}/test.tar"/>
     <mkdir dir="${input}/subdir"/>
@@ -100,8 +100,8 @@
       <zipfileset src="../resources/asf-logo.gif.zip"
                   includes="asf-logo.gif"/>
     </cmp:tar>
-    <checkProperties dateTime="2001-11-19-15:34:20"
-                     pattern="yyyy-MM-dd-HH:mm:ss"
+    <checkProperties dateTime="${zip-ts-value}"
+                     pattern="${zip-ts-pattern}"
                      mode="644"/>
   </target>
 
@@ -110,8 +110,8 @@
       <cmp:zipfileset src="../resources/asf-logo.gif.zip"
                       includes="asf-logo.gif"/>
     </cmp:tar>
-    <checkProperties dateTime="2001-11-19-15:34:20"
-                     pattern="yyyy-MM-dd-HH:mm:ss"
+    <checkProperties dateTime="${zip-ts-value}"
+                     pattern="${zip-ts-pattern}"
                      mode="644"/>
   </target>
 

http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/c673a2c0/src/tests/antunit/zip-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/zip-test.xml b/src/tests/antunit/zip-test.xml
index 1e6d91d..88cf060 100644
--- a/src/tests/antunit/zip-test.xml
+++ b/src/tests/antunit/zip-test.xml
@@ -22,7 +22,7 @@
 
   <import file="antunit-base.xml" />
 
-  <target name="setUp">
+  <target name="setUp" depends="-set-zip-ts-properties">
     <mkdir dir="${output}"/>
     <property name="dest" location="${output}/test.zip"/>
     <mkdir dir="${input}/subdir"/>
@@ -68,8 +68,8 @@
       <zipfileset src="../resources/asf-logo.gif.zip"
                   includes="asf-logo.gif"/>
     </cmp:zip>
-    <checkProperties dateTime="2001-11-19-15:34:20"
-                     pattern="yyyy-MM-dd-HH:mm:ss"
+    <checkProperties dateTime="${zip-ts-value}"
+                     pattern="${zip-ts-pattern}"
                      mode="644"/>
   </target>
 
@@ -78,8 +78,8 @@
       <cmp:zipfileset src="../resources/asf-logo.gif.zip"
                       includes="asf-logo.gif"/>
     </cmp:zip>
-    <checkProperties dateTime="2001-11-19-15:34:20"
-                     pattern="yyyy-MM-dd-HH:mm:ss"
+    <checkProperties dateTime="${zip-ts-value}"
+                     pattern="${zip-ts-pattern}"
                      mode="644"/>
   </target>
 

http://git-wip-us.apache.org/repos/asf/ant-antlibs-compress/blob/c673a2c0/src/tests/antunit/zipentry-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/zipentry-test.xml b/src/tests/antunit/zipentry-test.xml
index 8c06ee9..0ee89e8 100644
--- a/src/tests/antunit/zipentry-test.xml
+++ b/src/tests/antunit/zipentry-test.xml
@@ -22,7 +22,7 @@
 
   <import file="antunit-base.xml" />
 
-  <target name="setUp">
+  <target name="setUp" depends="-set-zip-ts-properties">
     <mkdir dir="${output}"/>
     <mkdir dir="${input}"/>
   </target>
@@ -57,8 +57,8 @@
 
   <target name="testResourceProperties">
     <au:assertTrue>
-      <cond:islastmodified datetime="2001-11-19-15:34:20"
-                           pattern="yyyy-MM-dd-HH:mm:ss">
+      <cond:islastmodified datetime="${zip-ts-value}"
+                           pattern="${zip-ts-pattern}">
         <cmp:zipentry name="asf-logo.gif">
           <file file="../resources/asf-logo.gif.zip"/>
         </cmp:zipentry>