From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Fri, 5 Oct 2012 02:46:23 +0000 (+0900)
Subject: Avoid test_read_format_cab failure if no zlib.
X-Git-Tag: v3.1.0~40^2~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=974426867a40e112ef3a95da7997a2c4706fafa5;p=thirdparty%2Flibarchive.git

Avoid test_read_format_cab failure if no zlib.
---

diff --git a/libarchive/test/test_read_format_cab.c b/libarchive/test/test_read_format_cab.c
index 004d6e8a9..5e5cdcb8f 100644
--- a/libarchive/test/test_read_format_cab.c
+++ b/libarchive/test/test_read_format_cab.c
@@ -280,6 +280,11 @@ verify2(const char *refname, enum comp_type comp)
 	char buff[128];
 	char zero[128];
 
+	if (comp == MSZIP && !libz_enabled) {
+		skipping("Skipping CAB format(MSZIP) check for %s",
+		  refname);
+		return;
+	}
 	memset(zero, 0, sizeof(zero));
 	extract_reference_file(refname);
 	assert((a = archive_read_new()) != NULL);