Merge r1167 (part a) from trunk

Fix a bunch of tests on Visual Studio:
 * detect bzip2 unavailability and skip those tests
	libarchive/test/test_read_format_cpio_bin_bz2.c
	libarchive/test/test_read_format_pax_bz2.c
	libarchive/test/test_read_format_tbz.c
------------------------------------------------------------------------

SVN-Revision: 1254

diff --git a/libarchive/test/test_read_format_cpio_bin_bz2.c b/libarchive/test/test_read_format_cpio_bin_bz2.c
index 2b5b67d279734b0f217186540e6f0d85d7d7ced9..88285a7cb0f74021e526f92b171469f2acc1918f 100644 (file)
--- a/libarchive/test/test_read_format_cpio_bin_bz2.c
+++ b/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)));

diff --git a/libarchive/test/test_read_format_pax_bz2.c b/libarchive/test/test_read_format_pax_bz2.c
index b75a5bd42abcf22f0382a32ddb2a9ff787082464..5e55f8ce8bfc0bdedc50feb58b302c02efad3dcd 100644 (file)
--- a/libarchive/test/test_read_format_pax_bz2.c
+++ b/libarchive/test/test_read_format_pax_bz2.c
@@ -44,9 +44,15 @@ DEFINE_TEST(test_read_format_pax_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) {
+               archive_read_close(a);
+               skipping("Bzip2 unavailable");
+               return;
+       }
        assertEqualIntA(a,ARCHIVE_OK, archive_read_support_format_all(a));
        assertEqualIntA(a,ARCHIVE_OK,
            archive_read_open_memory(a, archive, sizeof(archive)));

diff --git a/libarchive/test/test_read_format_tbz.c b/libarchive/test/test_read_format_tbz.c
index 51d30365193998926a29a956999e311c9e4c550c..0f11de49fed262188badc4d7bbdf3687360ae2ca 100644 (file)
--- a/libarchive/test/test_read_format_tbz.c
+++ b/libarchive/test/test_read_format_tbz.c
@@ -37,9 +37,15 @@ DEFINE_TEST(test_read_format_tbz)
 {
        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");
+               archive_read_finish(a);
+               return;
+       }
        assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_read_open_memory(a, archive, sizeof(archive)));