diff options
Diffstat (limited to 'archivers/libarchive/files/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c')
-rw-r--r-- | archivers/libarchive/files/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/archivers/libarchive/files/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c b/archivers/libarchive/files/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c index eb8a38d9df3..345760c1014 100644 --- a/archivers/libarchive/files/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c +++ b/archivers/libarchive/files/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c @@ -51,7 +51,7 @@ Name: ${NAME} Version: 1.0.0 Release: 1 License: BSD -URL: http://code.google.com/p/libarchive +URL: http://libarchive.github.com/ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -90,15 +90,15 @@ DEFINE_TEST(test_read_format_cpio_svr4_gzip_rpm) int r; assert((a = archive_read_new()) != NULL); - r = archive_read_support_compression_gzip(a); + r = archive_read_support_filter_gzip(a); if (r == ARCHIVE_WARN) { skipping("gzip reading not fully supported on this platform"); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); return; } assertEqualIntA(a, ARCHIVE_OK, r); assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_rpm(a)); + archive_read_support_filter_rpm(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); extract_reference_file(name); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 2)); @@ -112,16 +112,18 @@ DEFINE_TEST(test_read_format_cpio_svr4_gzip_rpm) assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualString("./etc/file3", archive_entry_pathname(ae)); assertEqualInt(86401, archive_entry_mtime(ae)); + assertEqualInt(archive_entry_is_encrypted(ae), 0); + assertEqualIntA(a, archive_read_has_encrypted_entries(a), ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED); /* Verify the end-of-archive. */ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); /* Verify that the format detection worked. */ - assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_GZIP); - assertEqualString(archive_compression_name(a), "gzip"); + assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_GZIP); + assertEqualString(archive_filter_name(a, 0), "gzip"); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_SVR4_NOCRC); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } |