From: Tim Kientzle <kientzle@gmail.com>
Date: Sun, 29 Nov 2009 20:35:13 +0000 (-0500)
Subject: r1679 provides a way to gracefully handle the failure to decompress single ZISOFS... 
X-Git-Tag: v2.8.0~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ca2b701f7da8cf121fe379dd2972c8a68e7e564;p=thirdparty%2Flibarchive.git

r1679 provides a way to gracefully handle the failure to decompress single ZISOFS entries; use that to suppress test failures in environments that lack zlib.

SVN-Revision: 1682
---

diff --git a/libarchive/test/test_read_format_isozisofs_bz2.c b/libarchive/test/test_read_format_isozisofs_bz2.c
index 4f4f9f062..56c39c0be 100644
--- a/libarchive/test/test_read_format_isozisofs_bz2.c
+++ b/libarchive/test/test_read_format_isozisofs_bz2.c
@@ -97,14 +97,19 @@ DEFINE_TEST(test_read_format_isozisofs_bz2)
 			assertEqualInt(1, archive_entry_uid(ae));
 			assertEqualInt(2, archive_entry_gid(ae));
 		} else if (strcmp("hardlink", archive_entry_pathname(ae)) == 0) {
+			int r;
 			/* A regular file. */
 			assertEqualString("hardlink", archive_entry_pathname(ae));
 			assertEqualInt(AE_IFREG, archive_entry_filetype(ae));
 			assertEqualInt(12345684, archive_entry_size(ae));
-			assertEqualInt(0,
-			    archive_read_data_block(a, &p, &size, &offset));
-			assertEqualInt(0, offset);
-			assertEqualMem(p, "hello\n", 6);
+			r = archive_read_data_block(a, &p, &size, &offset);
+			if (r == ARCHIVE_FAILED) {
+			  skipping("Can't read body of ZISOFS entry.");
+			} else {
+			  assertEqualInt(ARCHIVE_OK, r);
+			  assertEqualInt(0, offset);
+			  assertEqualMem(p, "hello\n", 6);
+			}
 			assertEqualInt(86401, archive_entry_mtime(ae));
 			assertEqualInt(2, archive_entry_stat(ae)->st_nlink);
 			assertEqualInt(1, archive_entry_uid(ae));