A raft of test changes and improvements from the Googlecode repository.

In particular, this includes tests for the new features I've merged
over the last few days.

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/libarchive/test/test_read_format_cpio_bin_bz2.c b/lib/libarchive/test/test_read_format_cpio_bin_bz2.c
index 90270c8..f7c4efb 100644
--- a/lib/libarchive/test/test_read_format_cpio_bin_bz2.c
+++ b/lib/libarchive/test/test_read_format_cpio_bin_bz2.c
@@ -36,10 +36,15 @@ DEFINE_TEST(test_read_format_cpio_bin_bz2)
 {
 	struct archive_entry *ae;
 	struct archive *a;
+	int r;
 
 	assert((a = archive_read_new()) != NULL);
-	assertEqualIntA(a, ARCHIVE_OK,
-	    archive_read_support_compression_all(a));
+	r = archive_read_support_compression_bzip2(a);
+	if (r != ARCHIVE_OK) {
+		skipping("bzip2 support unavailable");
+		archive_read_close(a);
+		return;
+	}
 	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
 	assertEqualIntA(a, ARCHIVE_OK,
 	    archive_read_open_memory(a, archive, sizeof(archive)));