From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Sat, 15 Dec 2012 23:19:09 +0000 (+0900)
Subject: Fix test failure without zlib.
X-Git-Tag: v3.1.0~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e903c4cb56384e3463f6d261d9b9cf9559c221b6;p=thirdparty%2Flibarchive.git

Fix test failure without zlib.
---

diff --git a/libarchive/test/test_archive_write_add_filter_by_name.c b/libarchive/test/test_archive_write_add_filter_by_name.c
index d1473363d..ff5ca5b1d 100644
--- a/libarchive/test/test_archive_write_add_filter_by_name.c
+++ b/libarchive/test/test_archive_write_add_filter_by_name.c
@@ -54,6 +54,15 @@ test_filter_by_name(const char *filter_name, int filter_code,
 			free(buff);
 			return;
 		}
+	} else if (r == ARCHIVE_FATAL &&
+	    (strcmp(archive_error_string(a),
+		   "lzma compression not supported on this platform") == 0 ||
+	     strcmp(archive_error_string(a),
+		   "xz compression not supported on this platform") == 0)) {
+		skipping("%s filter not suported on this platform", filter_name);
+		assertEqualInt(ARCHIVE_OK, archive_write_free(a));
+		free(buff);
+		return;
 	} else {
 		if (!assertEqualIntA(a, ARCHIVE_OK, r)) {
 			assertEqualInt(ARCHIVE_OK, archive_write_free(a));
diff --git a/libarchive/test/test_read_set_format.c b/libarchive/test/test_read_set_format.c
index 2b3ec1bdc..c218c4293 100644
--- a/libarchive/test/test_read_set_format.c
+++ b/libarchive/test/test_read_set_format.c
@@ -133,7 +133,7 @@ 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) {
+  if (r == ARCHIVE_WARN && !canGzip()) {
     skipping("gzip reading not fully supported on this platform");
     assertEqualInt(ARCHIVE_OK, archive_read_free(a));
     return;