diff options
| author | mm <mm@FreeBSD.org> | 2013-03-22 13:36:03 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2013-03-22 13:36:03 +0000 |
| commit | 5ee0a7b76c4addc27bb45864cb4e0ce790a4b80e (patch) | |
| tree | e741e3532b574e7c25aa9bb07c18cdb16139824f /contrib/libarchive/libarchive/test/test_read_format_cab.c | |
| parent | af89cb16bfde2fc8e93708b89daff55026d3b216 (diff) | |
| parent | 366f42737cba40ceb2e83af8d17c61c0242703c5 (diff) | |
| download | FreeBSD-src-5ee0a7b76c4addc27bb45864cb4e0ce790a4b80e.zip FreeBSD-src-5ee0a7b76c4addc27bb45864cb4e0ce790a4b80e.tar.gz | |
MFV r248590,248594:
Update libarchive to 3.1.2
Some of new features:
- support for lrzip and grzip compression
- support for writing tar v7 format
- b64encode and uuencode filters
- support for __MACOSX directory in Zip archives
- support for lzop compresion (external utility)
Diffstat (limited to 'contrib/libarchive/libarchive/test/test_read_format_cab.c')
| -rw-r--r-- | contrib/libarchive/libarchive/test/test_read_format_cab.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/contrib/libarchive/libarchive/test/test_read_format_cab.c b/contrib/libarchive/libarchive/test/test_read_format_cab.c index 004d6e8..e09d46d 100644 --- a/contrib/libarchive/libarchive/test/test_read_format_cab.c +++ b/contrib/libarchive/libarchive/test/test_read_format_cab.c @@ -260,7 +260,7 @@ verify(const char *refname, enum comp_type comp) } /* Verify archive format. */ - assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_compression(a)); + assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0)); assertEqualIntA(a, ARCHIVE_FORMAT_CAB, archive_format(a)); /* Close the archive. */ @@ -280,6 +280,11 @@ verify2(const char *refname, enum comp_type comp) char buff[128]; char zero[128]; + if (comp == MSZIP && !libz_enabled) { + skipping("Skipping CAB format(MSZIP) check for %s", + refname); + return; + } memset(zero, 0, sizeof(zero)); extract_reference_file(refname); assert((a = archive_read_new()) != NULL); @@ -316,7 +321,7 @@ verify2(const char *refname, enum comp_type comp) } /* Verify archive format. */ - assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_compression(a)); + assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0)); assertEqualIntA(a, ARCHIVE_FORMAT_CAB, archive_format(a)); /* Close the archive. */ @@ -363,7 +368,7 @@ verify3(const char *refname, enum comp_type comp) } /* Verify archive format. */ - assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_compression(a)); + assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0)); assertEqualIntA(a, ARCHIVE_FORMAT_CAB, archive_format(a)); /* Close the archive. */ |
