diff options
author | kientzle <kientzle@FreeBSD.org> | 2009-03-03 17:02:51 +0000 |
---|---|---|
committer | kientzle <kientzle@FreeBSD.org> | 2009-03-03 17:02:51 +0000 |
commit | 8fc5e74eab7c5235eef741a5e99412c1c314b9c6 (patch) | |
tree | 1dee8b4b9c023077ab174a6dc9ffbb460e86b36b /lib/libarchive/test/test_read_format_isorr_bz2.c | |
parent | 534d3efa16fa0651c5b97d3d506ddce25334a6d9 (diff) | |
download | FreeBSD-src-8fc5e74eab7c5235eef741a5e99412c1c314b9c6.zip FreeBSD-src-8fc5e74eab7c5235eef741a5e99412c1c314b9c6.tar.gz |
Merge r294:337,r348:350 from libarchive.googlecode.com: A lot
of work to make libarchive work on Windows.
Diffstat (limited to 'lib/libarchive/test/test_read_format_isorr_bz2.c')
-rw-r--r-- | lib/libarchive/test/test_read_format_isorr_bz2.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/libarchive/test/test_read_format_isorr_bz2.c b/lib/libarchive/test/test_read_format_isorr_bz2.c index a6ad832..a647813 100644 --- a/lib/libarchive/test/test_read_format_isorr_bz2.c +++ b/lib/libarchive/test/test_read_format_isorr_bz2.c @@ -51,10 +51,17 @@ DEFINE_TEST(test_read_format_isorr_bz2) const void *p; size_t size; off_t offset; + int r; extract_reference_file(refname); assert((a = archive_read_new()) != NULL); - assertEqualInt(0, archive_read_support_compression_all(a)); + r = archive_read_support_compression_bzip2(a); + if (r == ARCHIVE_FATAL) { + skipping("Bzip2 decompression unsupported on this platform"); + archive_read_finish(a); + return; + } + assertEqualInt(0, r); assertEqualInt(0, archive_read_support_format_all(a)); assertEqualInt(0, archive_read_open_filename(a, refname, 10240)); @@ -70,7 +77,7 @@ DEFINE_TEST(test_read_format_isorr_bz2) assertEqualInt(0, archive_entry_uid(ae)); assertEqualIntA(a, ARCHIVE_EOF, archive_read_data_block(a, &p, &size, &offset)); - assertEqualInt(size, 0); + assertEqualInt((int)size, 0); /* A directory. */ assertEqualInt(0, archive_read_next_header(a, &ae)); @@ -89,7 +96,7 @@ DEFINE_TEST(test_read_format_isorr_bz2) assert(S_ISREG(archive_entry_stat(ae)->st_mode)); assertEqualInt(6, archive_entry_size(ae)); assertEqualInt(0, archive_read_data_block(a, &p, &size, &offset)); - assertEqualInt(6, size); + assertEqualInt(6, (int)size); assertEqualInt(0, offset); assertEqualInt(0, memcmp(p, "hello\n", 6)); assertEqualInt(86401, archive_entry_mtime(ae)); |