Author: bodewig
Date: Sun Aug 23 05:49:46 2009
New Revision: 806931
URL: http://svn.apache.org/viewvc?rev=806931&view=rev
Log:
the zip code has different ideas about timezones than the other three
Modified:
ant/sandbox/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml
(contents, props changed)
ant/sandbox/antlibs/compress/trunk/src/tests/antunit/tar-test.xml
(contents, props changed)
ant/sandbox/antlibs/compress/trunk/src/tests/antunit/zip-test.xml
(contents, props changed)
Modified: ant/sandbox/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml?rev=806931&r1=806930&r2=806931&view=diff
==============================================================================
--- ant/sandbox/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml
(original)
+++ ant/sandbox/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml Sun Aug
23 05:49:46 2009
@@ -28,6 +28,7 @@
<copy todir="${input}/subdir" file="../resources/asf-logo.gif"/>
<property name="dest" location="${output}/test.cpio"/>
<macrodef name="checkProperties">
+ <attribute name="pattern" default="yyyy-MM-dd-HH:mm:ss Z"/>
<attribute name="dateTime"/>
<attribute name="uid" default="0"/>
<attribute name="gid" default="0"/>
@@ -35,7 +36,7 @@
<sequential>
<au:assertTrue>
<cond:islastmodified datetime="@{dateTime}"
- pattern="yyyy-MM-dd-HH:mm:ss Z">
+ pattern="@{pattern}">
<cmp:cpioentry name="asf-logo.gif">
<file file="${dest}"/>
</cmp:cpioentry>
@@ -83,7 +84,9 @@
<zipfileset src="../resources/asf-logo.gif.zip"
includes="asf-logo.gif"/>
</cmp:cpio>
- <checkProperties dateTime="2001-11-19-15:34:20 +0100" mode="33188"/>
+ <checkProperties dateTime="2001-11-19-15:34:20"
+ pattern="yyyy-MM-dd-HH:mm:ss"
+ mode="33188"/>
</target>
<target name="testAntlibZipFileSet" depends="setUp">
@@ -91,7 +94,9 @@
<cmp:zipfileset src="../resources/asf-logo.gif.zip"
includes="asf-logo.gif"/>
</cmp:cpio>
- <checkProperties dateTime="2001-11-19-15:34:20 +0100" mode="33188"/>
+ <checkProperties dateTime="2001-11-19-15:34:20"
+ pattern="yyyy-MM-dd-HH:mm:ss"
+ mode="33188"/>
</target>
<target name="testCoreTarFileSet" depends="setUp">
Propchange: ant/sandbox/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 23 05:49:46 2009
@@ -0,0 +1 @@
+/ant/sandbox/antlibs/compress/trunk/src/tests/antunit/ar-test.xml:806788
Modified: ant/sandbox/antlibs/compress/trunk/src/tests/antunit/tar-test.xml
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/compress/trunk/src/tests/antunit/tar-test.xml?rev=806931&r1=806930&r2=806931&view=diff
==============================================================================
--- ant/sandbox/antlibs/compress/trunk/src/tests/antunit/tar-test.xml (original)
+++ ant/sandbox/antlibs/compress/trunk/src/tests/antunit/tar-test.xml Sun Aug
23 05:49:46 2009
@@ -28,6 +28,7 @@
<mkdir dir="${input}/subdir"/>
<copy todir="${input}/subdir" file="../resources/asf-logo.gif"/>
<macrodef name="checkProperties">
+ <attribute name="pattern" default="yyyy-MM-dd-HH:mm:ss Z"/>
<attribute name="dateTime"/>
<attribute name="uid" default="0"/>
<attribute name="gid" default="0"/>
@@ -37,7 +38,7 @@
<sequential>
<au:assertTrue>
<cond:islastmodified datetime="@{dateTime}"
- pattern="yyyy-MM-dd-HH:mm:ss Z">
+ pattern="@{pattern}">
<cmp:tarentry name="asf-logo.gif">
<file file="${dest}"/>
</cmp:tarentry>
@@ -99,7 +100,9 @@
<zipfileset src="../resources/asf-logo.gif.zip"
includes="asf-logo.gif"/>
</cmp:tar>
- <checkProperties dateTime="2001-11-19-15:34:20 +0100" mode="33188"/>
+ <checkProperties dateTime="2001-11-19-15:34:20"
+ pattern="yyyy-MM-dd-HH:mm:ss"
+ mode="33188"/>
</target>
<target name="testAntlibZipFileSet" depends="setUp">
@@ -107,7 +110,9 @@
<cmp:zipfileset src="../resources/asf-logo.gif.zip"
includes="asf-logo.gif"/>
</cmp:tar>
- <checkProperties dateTime="2001-11-19-15:34:20 +0100" mode="33188"/>
+ <checkProperties dateTime="2001-11-19-15:34:20"
+ pattern="yyyy-MM-dd-HH:mm:ss"
+ mode="33188"/>
</target>
<target name="testCoreTarFileSet" depends="setUp">
Propchange: ant/sandbox/antlibs/compress/trunk/src/tests/antunit/tar-test.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 23 05:49:46 2009
@@ -1 +1,2 @@
+/ant/sandbox/antlibs/compress/trunk/src/tests/antunit/ar-test.xml:806788
/ant/sandbox/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml:806793
Modified: ant/sandbox/antlibs/compress/trunk/src/tests/antunit/zip-test.xml
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/compress/trunk/src/tests/antunit/zip-test.xml?rev=806931&r1=806930&r2=806931&view=diff
==============================================================================
--- ant/sandbox/antlibs/compress/trunk/src/tests/antunit/zip-test.xml (original)
+++ ant/sandbox/antlibs/compress/trunk/src/tests/antunit/zip-test.xml Sun Aug
23 05:49:46 2009
@@ -28,12 +28,13 @@
<mkdir dir="${input}/subdir"/>
<copy todir="${input}/subdir" file="../resources/asf-logo.gif"/>
<macrodef name="checkProperties">
+ <attribute name="pattern" default="yyyy-MM-dd-HH:mm:ss Z"/>
<attribute name="dateTime"/>
<attribute name="mode" default="33188"/>
<sequential>
<au:assertTrue>
<cond:islastmodified datetime="@{dateTime}"
- pattern="yyyy-MM-dd-HH:mm:ss Z">
+ pattern="@{pattern}">
<cmp:zipentry name="asf-logo.gif">
<file file="${dest}"/>
</cmp:zipentry>
@@ -67,7 +68,9 @@
<zipfileset src="../resources/asf-logo.gif.zip"
includes="asf-logo.gif"/>
</cmp:zip>
- <checkProperties dateTime="2001-11-19-15:34:20 +0100" mode="33188"/>
+ <checkProperties dateTime="2001-11-19-15:34:20"
+ pattern="yyyy-MM-dd-HH:mm:ss"
+ mode="33188"/>
</target>
<target name="testAntlibZipFileSet" depends="setUp">
@@ -75,7 +78,9 @@
<cmp:zipfileset src="../resources/asf-logo.gif.zip"
includes="asf-logo.gif"/>
</cmp:zip>
- <checkProperties dateTime="2001-11-19-15:34:20 +0100" mode="33188"/>
+ <checkProperties dateTime="2001-11-19-15:34:20"
+ pattern="yyyy-MM-dd-HH:mm:ss"
+ mode="33188"/>
</target>
<target name="testCoreTarFileSet" depends="setUp">
Propchange: ant/sandbox/antlibs/compress/trunk/src/tests/antunit/zip-test.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 23 05:49:46 2009
@@ -1 +1,2 @@
+/ant/sandbox/antlibs/compress/trunk/src/tests/antunit/ar-test.xml:806788
/ant/sandbox/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml:806793
