From: Michał Górny <mgorny@gentoo.org>
Date: Sat, 12 Feb 2022 10:12:27 +0000 (+0100)
Subject: Handle missing zlib in test_read_format_zip_7z_deflate
X-Git-Tag: v3.6.1~13^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1668%2Fhead;p=thirdparty%2Flibarchive.git

Handle missing zlib in test_read_format_zip_7z_deflate
---

diff --git a/libarchive/test/test_read_format_zip.c b/libarchive/test/test_read_format_zip.c
index bc498fa43..642a5e222 100644
--- a/libarchive/test/test_read_format_zip.c
+++ b/libarchive/test/test_read_format_zip.c
@@ -1128,6 +1128,7 @@ DEFINE_TEST(test_read_format_zip_7z_deflate)
 	const char *refname = "test_read_format_zip_7z_deflate.zip";
 	struct archive_entry *ae;
 	struct archive *a;
+	int r;
 
 	assert((a = archive_read_new()) != NULL);
 	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
@@ -1137,15 +1138,33 @@ DEFINE_TEST(test_read_format_zip_7z_deflate)
 	assertEqualIntA(a, ARCHIVE_OK,
 		archive_read_open_filename(a, refname, 10240));
 	//read first symlink
-	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	r = archive_read_next_header(a, &ae);
+	if (archive_zlib_version() == NULL) {
+		assertEqualInt(ARCHIVE_FAILED, r);
+		assertEqualString(archive_error_string(a),
+		    "Unsupported ZIP compression method during decompression "
+		    "of link entry (8: deflation)");
+		assert(archive_errno(a) != 0);
+	} else {
+		assertEqualIntA(a, ARCHIVE_OK, r);
+		assertEqualString("libxkbcommon-x11.so.0.0.0",
+			archive_entry_symlink(ae));
+	}
 	assertEqualInt(AE_IFLNK, archive_entry_filetype(ae));
-	assertEqualString("libxkbcommon-x11.so.0.0.0",
-		archive_entry_symlink(ae));
 	//read second symlink
-	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	r = archive_read_next_header(a, &ae);
+	if (archive_zlib_version() == NULL) {
+		assertEqualInt(ARCHIVE_FAILED, r);
+		assertEqualString(archive_error_string(a),
+		    "Unsupported ZIP compression method during decompression "
+		    "of link entry (8: deflation)");
+		assert(archive_errno(a) != 0);
+	} else {
+		assertEqualIntA(a, ARCHIVE_OK, r);
+		assertEqualString("libxkbcommon-x11.so.0.0.0",
+			archive_entry_symlink(ae));
+	}
 	assertEqualInt(AE_IFLNK, archive_entry_filetype(ae));
-	assertEqualString("libxkbcommon-x11.so.0.0.0",
-		archive_entry_symlink(ae));
 	assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 	assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
 }