diff options
author | kientzle <kientzle@FreeBSD.org> | 2009-04-17 01:06:31 +0000 |
---|---|---|
committer | kientzle <kientzle@FreeBSD.org> | 2009-04-17 01:06:31 +0000 |
commit | 621fee72b361fb219dc90b56c58ec551f03a1072 (patch) | |
tree | 53d4a3656571c490fa7ee297568309894736ba26 /lib/libarchive/test/test_read_format_gtar_gz.c | |
parent | 68cb951cd0d330003aa4564ad6312d927b58c5ae (diff) | |
download | FreeBSD-src-621fee72b361fb219dc90b56c58ec551f03a1072.zip FreeBSD-src-621fee72b361fb219dc90b56c58ec551f03a1072.tar.gz |
Merge lots of test suite updates from libarchive.googlecode.com.
Diffstat (limited to 'lib/libarchive/test/test_read_format_gtar_gz.c')
-rw-r--r-- | lib/libarchive/test/test_read_format_gtar_gz.c | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/lib/libarchive/test/test_read_format_gtar_gz.c b/lib/libarchive/test/test_read_format_gtar_gz.c index 6d3b66d..8f12a65 100644 --- a/lib/libarchive/test/test_read_format_gtar_gz.c +++ b/lib/libarchive/test/test_read_format_gtar_gz.c @@ -39,26 +39,22 @@ DEFINE_TEST(test_read_format_gtar_gz) int r; assert((a = archive_read_new()) != NULL); - assert(0 == archive_read_support_compression_all(a)); - assert(0 == archive_read_support_format_all(a)); - assert(0 == archive_read_open_memory(a, archive, sizeof(archive))); - r = archive_read_next_header(a, &ae); - if (UnsupportedCompress(r, a)) { - skipping("Skipping GZIP compression check: " - "This version of libarchive was compiled " - "without gzip support"); - goto finish; + assertEqualInt(ARCHIVE_OK, archive_read_support_compression_all(a)); + r = archive_read_support_compression_gzip(a); + if (r == ARCHIVE_WARN) { + skipping("gzip reading not fully supported on this platform"); + assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + return; } - assert(0 == r); - assert(archive_compression(a) == ARCHIVE_COMPRESSION_GZIP); - assert(archive_format(a) == ARCHIVE_FORMAT_TAR_GNUTAR); - assert(0 == archive_read_close(a)); -finish: -#if ARCHIVE_VERSION_NUMBER < 2000000 - archive_read_finish(a); -#else - assert(0 == archive_read_finish(a)); -#endif + assertEqualInt(ARCHIVE_OK, archive_read_support_format_all(a)); + assertEqualInt(ARCHIVE_OK, + archive_read_open_memory(a, archive, sizeof(archive))); + assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualInt(archive_compression(a), + ARCHIVE_COMPRESSION_GZIP); + assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_GNUTAR); + assertEqualInt(ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); } |