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 cbd113b0153a9d6144a715fdbce0c6778cf0c1cc..96eacad79cc4f03f4e3ca6a247c01e9f91dc30be 100644 (file)
--- 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));