From: Charles Wilson <cwilso11@gmail.com>
Date: Tue, 21 Jul 2009 03:56:12 +0000 (-0400)
Subject: Merge r1164 from trunk
X-Git-Tag: v2.7.1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecd92d69414029e69a58dc4bbab78aa71d7cd771;p=thirdparty%2Flibarchive.git

Merge r1164 from trunk
Skip this test if libarchive isn't compiled with libbz2.
------------------------------------------------------------------------

SVN-Revision: 1253
---

diff --git a/libarchive/test/test_compat_bzip2.c b/libarchive/test/test_compat_bzip2.c
index cbd113b01..96eacad79 100644
--- a/libarchive/test/test_compat_bzip2.c
+++ b/libarchive/test/test_compat_bzip2.c
@@ -47,7 +47,10 @@ compat_bzip2(const char *name)
 	int i;
 
 	assert((a = archive_read_new()) != NULL);
-	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a));
+	if (ARCHIVE_OK != archive_read_support_compression_bzip2(a)) {
+		skipping("Unsupported bzip2");
+		return;
+	}
 	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
 	extract_reference_file(name);
 	assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 2));