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).

diff --git a/libarchive/test/test_read_format_rar_encryption_data.c b/libarchive/test/test_read_format_rar_encryption_data.c
index 2e7b5fad9dcf38bb3ef29adc1393d715a6a92cb3..d0c06fb2149938a2e1fcb898682f3366d0645851 100644 (file)
--- 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 733f162300d561f5555fd3ecf3a265ac44bdf036..81256a96a0194f8c1912f818e3e6a4a5631ff7da 100644 (file)
--- 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 771d7f7b46d583bee5c4a3d3f5fc9be13a5c3955..6e36663c5a2ef2b3b9679253dac9eb462b8eeda4 100644 (file)
--- 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 7724721ff339f175a47beb7f6172b7a89e4d6f0d..9d862dcd2637c53ff7b574b4b27d257dc149c050 100644 (file)
--- 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));