]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Fix test failure without liblzma.
authorMichihiro NAKAJIMA <ggcueroad@gmail.com>
Sun, 16 Dec 2012 00:21:14 +0000 (09:21 +0900)
committerMichihiro NAKAJIMA <ggcueroad@gmail.com>
Sun, 16 Dec 2012 00:21:14 +0000 (09:21 +0900)
libarchive/test/test_read_set_format.c

index c218c42936d0b00e189d88987fabc21250183e66..6b5e8e4a802a75b0b895cf059730245b99cb9056 100644 (file)
@@ -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));
 }