diff options
author | Martin Matuska <martin@matuska.org> | 2020-01-22 16:07:12 +0100 |
---|---|---|
committer | Martin Matuska <martin@matuska.org> | 2020-01-22 17:34:47 +0100 |
commit | 0c9f04e7a93463cb0a2e27c210904393498e252f (patch) | |
tree | 0f655fe420c4f4491dcdba23f088d9161e663007 | |
parent | 25565e1e259e3ee212b8bf6a15eb5ceb31323548 (diff) | |
download | libarchive-0c9f04e7a93463cb0a2e27c210904393498e252f.tar.gz |
Fix 7zip_packinfo_digests test when LZMA is not supported
-rw-r--r-- | libarchive/test/test_read_format_7zip.c | 3 | ||||
-rw-r--r-- | libarchive/test/test_read_format_7zip_packinfo_digests.c | 75 |
2 files changed, 41 insertions, 37 deletions
diff --git a/libarchive/test/test_read_format_7zip.c b/libarchive/test/test_read_format_7zip.c index a51bdf7b..06ee9485 100644 --- a/libarchive/test/test_read_format_7zip.c +++ b/libarchive/test/test_read_format_7zip.c @@ -720,7 +720,6 @@ DEFINE_TEST(test_read_format_7zip) /* Extracting with liblzma */ if (ARCHIVE_OK != archive_read_support_filter_xz(a)) { - assertEqualInt(ARCHIVE_OK, archive_read_free(a)); skipping("7zip:lzma decoding is not supported on this " "platform"); } else { @@ -797,7 +796,6 @@ DEFINE_TEST(test_read_format_7zip_lzma1) /* Extracting with liblzma */ if (ARCHIVE_OK != archive_read_support_filter_xz(a)) { - assertEqualInt(ARCHIVE_OK, archive_read_free(a)); skipping("7zip:lzma decoding is not supported on this " "platform"); } else { @@ -820,7 +818,6 @@ DEFINE_TEST(test_read_format_7zip_lzma2) /* Extracting with liblzma */ if (ARCHIVE_OK != archive_read_support_filter_xz(a)) { - assertEqualInt(ARCHIVE_OK, archive_read_free(a)); skipping("7zip:lzma decoding is not supported on this " "platform"); } else { diff --git a/libarchive/test/test_read_format_7zip_packinfo_digests.c b/libarchive/test/test_read_format_7zip_packinfo_digests.c index 3abee709..7f105d1f 100644 --- a/libarchive/test/test_read_format_7zip_packinfo_digests.c +++ b/libarchive/test/test_read_format_7zip_packinfo_digests.c @@ -36,47 +36,54 @@ DEFINE_TEST(test_read_format_7zip_packinfo_digests) extract_reference_file(refname); assert((a = archive_read_new()) != NULL); if (ARCHIVE_OK != archive_read_support_filter_xz(a)) { - assertEqualInt(ARCHIVE_OK, archive_read_free(a)); skipping("7zip:lzma decoding is not supported on this " "platform"); - } - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, - archive_read_open_filename(a, refname, 10240)); + } else { + assertEqualIntA(a, ARCHIVE_OK, + archive_read_support_filter_all(a)); + assertEqualIntA(a, ARCHIVE_OK, + archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, + archive_read_open_filename(a, refname, 10240)); - /* Verify regular file1. */ - assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); - assertEqualInt((AE_IFREG | 0666), archive_entry_mode(ae)); - assertEqualString("a.txt", archive_entry_pathname(ae)); - assertEqualInt(1576808819, archive_entry_mtime(ae)); - assertEqualInt(4, archive_entry_size(ae)); - assertEqualInt(archive_entry_is_encrypted(ae), 0); - assertEqualIntA(a, archive_read_has_encrypted_entries(a), 0); - assertEqualInt(4, archive_read_data(a, buff, sizeof(buff))); - assertEqualMem(buff, "aaa\n", 4); + /* Verify regular file1. */ + assertEqualIntA(a, ARCHIVE_OK, + archive_read_next_header(a, &ae)); + assertEqualInt((AE_IFREG | 0666), archive_entry_mode(ae)); + assertEqualString("a.txt", archive_entry_pathname(ae)); + assertEqualInt(1576808819, archive_entry_mtime(ae)); + assertEqualInt(4, archive_entry_size(ae)); + assertEqualInt(archive_entry_is_encrypted(ae), 0); + assertEqualIntA(a, archive_read_has_encrypted_entries(a), 0); + assertEqualInt(4, archive_read_data(a, buff, sizeof(buff))); + assertEqualMem(buff, "aaa\n", 4); - /* Verify regular file2. */ - assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); - assertEqualInt((AE_IFREG | 0666), archive_entry_mode(ae)); - assertEqualString("b.txt", archive_entry_pathname(ae)); - assertEqualInt(1576808819, archive_entry_mtime(ae)); - assertEqualInt(4, archive_entry_size(ae)); - assertEqualInt(archive_entry_is_encrypted(ae), 0); - assertEqualIntA(a, archive_read_has_encrypted_entries(a), 0); - assertEqualInt(4, archive_read_data(a, buff, sizeof(buff))); - assertEqualMem(buff, "bbb\n", 4); + /* Verify regular file2. */ + assertEqualIntA(a, ARCHIVE_OK, + archive_read_next_header(a, &ae)); + assertEqualInt((AE_IFREG | 0666), archive_entry_mode(ae)); + assertEqualString("b.txt", archive_entry_pathname(ae)); + assertEqualInt(1576808819, archive_entry_mtime(ae)); + assertEqualInt(4, archive_entry_size(ae)); + assertEqualInt(archive_entry_is_encrypted(ae), 0); + assertEqualIntA(a, archive_read_has_encrypted_entries(a), 0); + assertEqualInt(4, archive_read_data(a, buff, sizeof(buff))); + assertEqualMem(buff, "bbb\n", 4); - assertEqualInt(2, archive_file_count(a)); + assertEqualInt(2, archive_file_count(a)); - /* End of archive. */ - assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); + /* End of archive. */ + assertEqualIntA(a, ARCHIVE_EOF, + archive_read_next_header(a, &ae)); - /* Verify archive format. */ - assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0)); - assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a)); + /* Verify archive format. */ + assertEqualIntA(a, ARCHIVE_FILTER_NONE, + archive_filter_code(a, 0)); + assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, + archive_format(a)); - /* Close the archive. */ - assertEqualInt(ARCHIVE_OK, archive_read_close(a)); + /* Close the archive. */ + assertEqualInt(ARCHIVE_OK, archive_read_close(a)); + } assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } |