Check if xar writer is supported.

SVN-Revision: 2419

diff --git a/libarchive/test/test_write_format_xar.c b/libarchive/test/test_write_format_xar.c
index b1f3b3484b7a371c6d5920378754e0cde8cebf7b..835a11bb2576f62140b21a41d394dbcd4dc2aa91 100644 (file)
--- a/libarchive/test/test_write_format_xar.c
+++ b/libarchive/test/test_write_format_xar.c
@@ -42,7 +42,11 @@ test_xar(const char *option)
 
        /* Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
-       assertA(0 == archive_write_set_format_xar(a));
+       if (archive_write_set_format_xar(a) != ARCHIVE_OK) {
+               skipping("xar is not supported on this platform");
+               assertEqualIntA(a, ARCHIVE_OK, archive_write_free(a));
+               return;
+       }
        assertA(0 == archive_write_set_compression_none(a));
        if (option != NULL &&
            archive_write_set_options(a, option) != ARCHIVE_OK) {

diff --git a/libarchive/test/test_write_format_xar_empty.c b/libarchive/test/test_write_format_xar_empty.c
index ae37690a81ad86a6c890762d0b6cb75a69c006b5..cad9dbcf5f900539007cf0e89095deaa1dc2ead0 100644 (file)
--- a/libarchive/test/test_write_format_xar_empty.c
+++ b/libarchive/test/test_write_format_xar_empty.c
@@ -39,7 +39,11 @@ DEFINE_TEST(test_write_format_xar_empty)
 
        /* Xar format: Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_xar(a));
+       if (archive_write_set_format_xar(a) != ARCHIVE_OK) {
+               skipping("xar is not supported on this platform");
+               assertEqualIntA(a, ARCHIVE_OK, archive_write_free(a));
+               return;
+       }
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_none(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_bytes_per_block(a, 1));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_bytes_in_last_block(a, 1));