From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Sun, 16 Dec 2012 00:21:14 +0000 (+0900)
Subject: Fix test failure without liblzma.
X-Git-Tag: v3.1.0~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79abd3af3525c0926f61b607116c1733261dd9a1;p=thirdparty%2Flibarchive.git

Fix test failure without liblzma.
---

diff --git a/libarchive/test/test_read_set_format.c b/libarchive/test/test_read_set_format.c
index c218c4293..6b5e8e4a8 100644
--- a/libarchive/test/test_read_set_format.c
+++ b/libarchive/test/test_read_set_format.c
@@ -157,15 +157,19 @@ DEFINE_TEST(test_read_append_wrong_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_XZ);
-  if (r == ARCHIVE_WARN) {
-    skipping("gzip reading not fully supported on this platform");
+  if (r == ARCHIVE_WARN && !canXz()) {
+    skipping("xz reading not fully supported on this platform");
     assertEqualInt(ARCHIVE_OK, archive_read_free(a));
     return;
   }
   assertEqualInt(ARCHIVE_OK,
       archive_read_open_memory(a, archive, sizeof(archive)));
   assertA(archive_read_next_header(a, &ae) < (ARCHIVE_WARN));
-  assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+  if (r == ARCHIVE_WARN && canXz()) {
+    assertEqualIntA(a, ARCHIVE_WARN, archive_read_close(a));
+  } else {
+    assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
+  }
   assertEqualInt(ARCHIVE_OK,archive_read_free(a));
 }