From 53d9c0ff198845542a876e2d463a9f6fdf5fd056 Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Thu, 19 Dec 2013 21:17:23 -0800 Subject: [PATCH] Zip and Rar store file times in local time, so we can't verify them in tests (since the time varies depending on the time zone where the tests are being run). --- libarchive/test/test_read_format_rar_encryption_data.c | 2 -- libarchive/test/test_read_format_rar_encryption_partially.c | 2 -- libarchive/test/test_read_format_zip_encryption_data.c | 2 -- libarchive/test/test_read_format_zip_encryption_partially.c | 2 -- 4 files changed, 8 deletions(-) diff --git a/libarchive/test/test_read_format_rar_encryption_data.c b/libarchive/test/test_read_format_rar_encryption_data.c index 2e7b5fad9..d0c06fb21 100644 --- a/libarchive/test/test_read_format_rar_encryption_data.c +++ b/libarchive/test/test_read_format_rar_encryption_data.c @@ -47,7 +47,6 @@ DEFINE_TEST(test_read_format_rar_encryption_data) assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualInt((AE_IFREG | 0664), archive_entry_mode(ae)); assertEqualString("foo.txt", archive_entry_pathname(ae)); - assertEqualInt(1379403430, archive_entry_mtime(ae)); assertEqualInt(16, archive_entry_size(ae)); assertEqualInt(1, archive_entry_is_data_encrypted(ae)); assertEqualInt(0, archive_entry_is_metadata_encrypted(ae)); @@ -58,7 +57,6 @@ DEFINE_TEST(test_read_format_rar_encryption_data) assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualInt((AE_IFREG | 0664), archive_entry_mode(ae)); assertEqualString("bar.txt", archive_entry_pathname(ae)); - assertEqualInt(1379403432, archive_entry_mtime(ae)); assertEqualInt(16, archive_entry_size(ae)); assertEqualInt(1, archive_entry_is_data_encrypted(ae)); assertEqualInt(0, archive_entry_is_metadata_encrypted(ae)); diff --git a/libarchive/test/test_read_format_rar_encryption_partially.c b/libarchive/test/test_read_format_rar_encryption_partially.c index 733f16230..81256a96a 100644 --- a/libarchive/test/test_read_format_rar_encryption_partially.c +++ b/libarchive/test/test_read_format_rar_encryption_partially.c @@ -48,7 +48,6 @@ DEFINE_TEST(test_read_format_rar_encryption_partially) assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualInt((AE_IFREG | 0664), archive_entry_mode(ae)); assertEqualString("foo.txt", archive_entry_pathname(ae)); - assertEqualInt(1379403430, archive_entry_mtime(ae)); assertEqualInt(16, archive_entry_size(ae)); assertEqualInt(1, archive_entry_is_data_encrypted(ae)); assertEqualInt(0, archive_entry_is_metadata_encrypted(ae)); @@ -59,7 +58,6 @@ DEFINE_TEST(test_read_format_rar_encryption_partially) assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualInt((AE_IFREG | 0664), archive_entry_mode(ae)); assertEqualString("bar.txt", archive_entry_pathname(ae)); - assertEqualInt(1379403432, archive_entry_mtime(ae)); assertEqualInt(16, archive_entry_size(ae)); assertEqualInt(0, archive_entry_is_data_encrypted(ae)); assertEqualInt(0, archive_entry_is_metadata_encrypted(ae)); diff --git a/libarchive/test/test_read_format_zip_encryption_data.c b/libarchive/test/test_read_format_zip_encryption_data.c index 771d7f7b4..6e36663c5 100644 --- a/libarchive/test/test_read_format_zip_encryption_data.c +++ b/libarchive/test/test_read_format_zip_encryption_data.c @@ -47,7 +47,6 @@ DEFINE_TEST(test_read_format_zip_encryption_data) assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualInt((AE_IFREG | 0666), archive_entry_mode(ae)); assertEqualString("bar.txt", archive_entry_pathname(ae)); - assertEqualInt(1379416406, archive_entry_mtime(ae)); assertEqualInt(20, archive_entry_size(ae)); assertEqualInt(1, archive_entry_is_data_encrypted(ae)); assertEqualInt(0, archive_entry_is_metadata_encrypted(ae)); @@ -58,7 +57,6 @@ DEFINE_TEST(test_read_format_zip_encryption_data) assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualInt((AE_IFREG | 0666), archive_entry_mode(ae)); assertEqualString("foo.txt", archive_entry_pathname(ae)); - assertEqualInt(1379416400, archive_entry_mtime(ae)); assertEqualInt(20, archive_entry_size(ae)); assertEqualInt(1, archive_entry_is_data_encrypted(ae)); assertEqualInt(0, archive_entry_is_metadata_encrypted(ae)); diff --git a/libarchive/test/test_read_format_zip_encryption_partially.c b/libarchive/test/test_read_format_zip_encryption_partially.c index 7724721ff..9d862dcd2 100644 --- a/libarchive/test/test_read_format_zip_encryption_partially.c +++ b/libarchive/test/test_read_format_zip_encryption_partially.c @@ -48,7 +48,6 @@ DEFINE_TEST(test_read_format_zip_encryption_partially) assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualInt((AE_IFREG | 0666), archive_entry_mode(ae)); assertEqualString("bar.txt", archive_entry_pathname(ae)); - assertEqualInt(1379416406, archive_entry_mtime(ae)); assertEqualInt(20, archive_entry_size(ae)); assertEqualInt(0, archive_entry_is_data_encrypted(ae)); assertEqualInt(0, archive_entry_is_metadata_encrypted(ae)); @@ -59,7 +58,6 @@ DEFINE_TEST(test_read_format_zip_encryption_partially) assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualInt((AE_IFREG | 0666), archive_entry_mode(ae)); assertEqualString("foo.txt", archive_entry_pathname(ae)); - assertEqualInt(1379416400, archive_entry_mtime(ae)); assertEqualInt(20, archive_entry_size(ae)); assertEqualInt(1, archive_entry_is_data_encrypted(ae)); assertEqualInt(0, archive_entry_is_metadata_encrypted(ae)); -- 2.47.2