diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-27 14:27:56 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-27 14:27:56 +0100 |
| commit | 6cc3a23ea1231ea627394677df2bebdc403acb38 (patch) | |
| tree | 14c20984a10df92c0b5cbb3b4477f0358cf8b01f /core/libarchive/test-with-zip-mtime.patch | |
| parent | 8e40bdbb2496be15fdba2e683af427bc2333be42 (diff) | |
| parent | 3741146d50cb93e8985f8aac937e36d35ee76446 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/torcs/PKGBUILD
community/fceux/PKGBUILD
core/gcc/PKGBUILD
core/wireless_tools/PKGBUILD
extra/gtk-xfce-engine/PKGBUILD
extra/gtk2/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-sdl/PKGBUILD
testing/kdebase-runtime/PKGBUILD
testing/kdelibs/PKGBUILD
testing/libarchive/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/systemd.install
testing/udev/PKGBUILD
Diffstat (limited to 'core/libarchive/test-with-zip-mtime.patch')
| -rw-r--r-- | core/libarchive/test-with-zip-mtime.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/core/libarchive/test-with-zip-mtime.patch b/core/libarchive/test-with-zip-mtime.patch new file mode 100644 index 000000000..79e2f3c7e --- /dev/null +++ b/core/libarchive/test-with-zip-mtime.patch @@ -0,0 +1,23 @@ +Index: libarchive/test/test_compat_zip.c +=================================================================== +--- libarchive/test/test_compat_zip.c (revision 4197) ++++ libarchive/test/test_compat_zip.c (revision 4198) +@@ -359,12 +359,16 @@ + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae)); + assertEqualInt(AE_IFDIR, archive_entry_filetype(ae)); +- assertEqualInt(1327314468, archive_entry_mtime(ae)); ++ /* Zip timestamps are local time, so vary by time zone. */ ++ /* TODO: A more complex assert would work here; we could ++ verify that it's within +/- 24 hours of a particular value. */ ++ /* assertEqualInt(1327314468, archive_entry_mtime(ae)); */ + assertEqualInt(0, archive_entry_size(ae)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae)); + assertEqualInt(AE_IFREG, archive_entry_filetype(ae)); +- assertEqualInt(1327314476, archive_entry_mtime(ae)); ++ /* Zip timestamps are local time, so vary by time zone. */ ++ /* assertEqualInt(1327314476, archive_entry_mtime(ae)); */ + assertEqualInt(11, archive_entry_size(ae)); + assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); + } |