From: Joerg Sonnenberger <joerg.sonnenberger@gmail.com>
Date: Tue, 26 May 2009 18:57:06 +0000 (-0400)
Subject: Match unknown filesize property for zip archives in the assertions.
X-Git-Tag: v2.8.0~613
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f8d79b1977e2bfd2078a4f9d9ac0d61fa3facd0;p=thirdparty%2Flibarchive.git

Match unknown filesize property for zip archives in the assertions.
Test the deflate case if zlib.h is present, otherwise use store.

SVN-Revision: 1131
---

diff --git a/libarchive/test/test_write_format_zip.c b/libarchive/test/test_write_format_zip.c
index 9f7965f5f..de8d11d15 100644
--- a/libarchive/test/test_write_format_zip.c
+++ b/libarchive/test/test_write_format_zip.c
@@ -47,6 +47,11 @@ DEFINE_TEST(test_write_format_zip)
 	/* Create a new archive in memory. */
 	assert((a = archive_write_new()) != NULL);
 	assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_zip(a));
+#ifdef HAVE_ZLIB_H
+	assertEqualIntA(a, ARCHIVE_OK, archive_write_zip_set_deflate(a));
+#else
+	assertEqualIntA(a, ARCHIVE_OK, archive_write_zip_set_store(a));
+#endif
 	assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_none(a));
 	assertEqualIntA(a, ARCHIVE_OK,
 	    archive_write_open_memory(a, buff, buffsize, &used));
@@ -127,8 +132,8 @@ DEFINE_TEST(test_write_format_zip)
 	assertEqualInt(0, archive_entry_ctime(ae));
 	assertEqualString("file", archive_entry_pathname(ae));
 	//assertEqualInt((S_IFREG | 0755), archive_entry_mode(ae));
-	assertEqualInt(8, archive_entry_size(ae));
-	assertEqualIntA(a, archive_entry_size(ae),
+	assertEqualInt(0, archive_entry_size(ae));
+	assertEqualIntA(a, 8,
 	    archive_read_data(a, filedata, sizeof(filedata)));
 	assertEqualMem(filedata, "12345678", 8);
 
@@ -146,8 +151,8 @@ DEFINE_TEST(test_write_format_zip)
 	assertEqualInt(0, archive_entry_ctime(ae));
 	assertEqualString("file2", archive_entry_pathname(ae));
 	//assert((S_IFREG | 0755) == archive_entry_mode(ae));
-	assertEqualInt(4, archive_entry_size(ae));
-	assertEqualIntA(a, archive_entry_size(ae),
+	assertEqualInt(0, archive_entry_size(ae));
+	assertEqualIntA(a, 4,
 	    archive_read_data(a, filedata, sizeof(filedata)));
 	assertEqualMem(filedata, "1234", 4);