From: Tim Kientzle <kientzle@acm.org>
Date: Mon, 24 Oct 2016 03:10:30 +0000 (-0700)
Subject: Skip gzip format check when both zlib and gzip are missing
X-Git-Tag: v3.2.2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f25316a9dfaaa3319bacc1c1fbeb81c2de7f86c;p=thirdparty%2Flibarchive.git

Skip gzip format check when both zlib and gzip are missing
---

diff --git a/libarchive/test/test_read_set_format.c b/libarchive/test/test_read_set_format.c
index 6ca043d4a..fb5e00474 100644
--- a/libarchive/test/test_read_set_format.c
+++ b/libarchive/test/test_read_set_format.c
@@ -133,11 +133,12 @@ DEFINE_TEST(test_read_append_filter)
   assert((a = archive_read_new()) != NULL);
   assertA(0 == archive_read_set_format(a, ARCHIVE_FORMAT_TAR));
   r = archive_read_append_filter(a, ARCHIVE_FILTER_GZIP);
-  if (r == ARCHIVE_WARN && !canGzip()) {
-    skipping("gzip reading not fully supported on this platform");
+  if (r != ARCHIVE_OK && archive_zlib_version() == NULL && !canGzip()) {
+    skipping("gzip tests require zlib or working gzip command");
     assertEqualInt(ARCHIVE_OK, archive_read_free(a));
     return;
   }
+  assertEqualIntA(a, ARCHIVE_OK, r);
   assertEqualInt(ARCHIVE_OK,
       archive_read_open_memory(a, archive, sizeof(archive)));
   assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &ae));