From 2fdea06a1d225f35b1cefb801914fa5352e220c7 Mon Sep 17 00:00:00 2001 From: Michihiro NAKAJIMA Date: Sun, 30 May 2010 10:31:22 -0400 Subject: [PATCH] Check if xar writer is supported. SVN-Revision: 2419 --- libarchive/test/test_write_format_xar.c | 6 +++++- libarchive/test/test_write_format_xar_empty.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libarchive/test/test_write_format_xar.c b/libarchive/test/test_write_format_xar.c index b1f3b3484..835a11bb2 100644 --- 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 ae37690a8..cad9dbcf5 100644 --- 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)); -- 2.47.3