diff options
author | kientzle <kientzle@FreeBSD.org> | 2009-03-05 00:42:50 +0000 |
---|---|---|
committer | kientzle <kientzle@FreeBSD.org> | 2009-03-05 00:42:50 +0000 |
commit | 65384b550b781f5df9c9e0e1c49bce608f97ea1e (patch) | |
tree | b2d5c017ff2107cf444554486a9332b4b48b668b /lib | |
parent | 56706d0f1726650f75850a2b425bf2ad94a5788d (diff) | |
download | FreeBSD-src-65384b550b781f5df9c9e0e1c49bce608f97ea1e.zip FreeBSD-src-65384b550b781f5df9c9e0e1c49bce608f97ea1e.tar.gz |
Merge r357 from libarchive.googlecode.com: bzip2 compression
support can always be enabled even if bzlib doesn't exist on
this platform; don't give up until we fail to open the file.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libarchive/test/test_read_format_isorr_bz2.c | 6 |
1 files changed, 3 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 a647813..79e8522 100644 --- a/lib/libarchive/test/test_read_format_isorr_bz2.c +++ b/lib/libarchive/test/test_read_format_isorr_bz2.c @@ -55,15 +55,15 @@ DEFINE_TEST(test_read_format_isorr_bz2) extract_reference_file(refname); assert((a = archive_read_new()) != NULL); - r = archive_read_support_compression_bzip2(a); + assertEqualInt(0, archive_read_support_compression_bzip2(a)); + assertEqualInt(0, archive_read_support_format_all(a)); + r = archive_read_open_filename(a, refname, 10240); 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)); /* First entry is '.' root directory. */ assertEqualInt(0, archive_read_next_header(a, &ae)); |