From cf9f3f777f72a2b57eeea5e5c86f1e380058c687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 12 Feb 2022 11:11:22 +0100 Subject: Fix expected error messages in test_read_format_zip_winzip_aes* Fix expected error messages when libarchive is compiled --without-zlib, in order to fix test failures. --- libarchive/test/test_read_format_zip_winzip_aes.c | 2 +- libarchive/test/test_read_format_zip_winzip_aes_large.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libarchive/test/test_read_format_zip_winzip_aes.c b/libarchive/test/test_read_format_zip_winzip_aes.c index cc1e3110..3f543927 100644 --- a/libarchive/test/test_read_format_zip_winzip_aes.c +++ b/libarchive/test/test_read_format_zip_winzip_aes.c @@ -115,7 +115,7 @@ test_winzip_aes(const char *refname, int need_libz) } else { assertEqualInt(ARCHIVE_FAILED, archive_read_data(a, buff, 19)); assertEqualString(archive_error_string(a), - "Unsupported ZIP compression method (deflation)"); + "Unsupported ZIP compression method (8: deflation)"); assert(archive_errno(a) != 0); } diff --git a/libarchive/test/test_read_format_zip_winzip_aes_large.c b/libarchive/test/test_read_format_zip_winzip_aes_large.c index 6c40ae76..f05e2183 100644 --- a/libarchive/test/test_read_format_zip_winzip_aes_large.c +++ b/libarchive/test/test_read_format_zip_winzip_aes_large.c @@ -143,7 +143,7 @@ DEFINE_TEST(test_read_format_zip_winzip_aes256_large) assertEqualInt(ARCHIVE_FAILED, archive_read_data(a, buff, sizeof(buff))); assertEqualString(archive_error_string(a), - "Unsupported ZIP compression method (deflation)"); + "Unsupported ZIP compression method (8: deflation)"); assert(archive_errno(a) != 0); } @@ -161,7 +161,7 @@ DEFINE_TEST(test_read_format_zip_winzip_aes256_large) assertEqualInt(ARCHIVE_FAILED, archive_read_data(a, buff, sizeof(buff))); assertEqualString(archive_error_string(a), - "Unsupported ZIP compression method (deflation)"); + "Unsupported ZIP compression method (8: deflation)"); assert(archive_errno(a) != 0); } @@ -179,7 +179,7 @@ DEFINE_TEST(test_read_format_zip_winzip_aes256_large) assertEqualInt(ARCHIVE_FAILED, archive_read_data(a, buff, sizeof(buff))); assertEqualString(archive_error_string(a), - "Unsupported ZIP compression method (deflation)"); + "Unsupported ZIP compression method (8: deflation)"); assert(archive_errno(a) != 0); } @@ -197,7 +197,7 @@ DEFINE_TEST(test_read_format_zip_winzip_aes256_large) assertEqualInt(ARCHIVE_FAILED, archive_read_data(a, buff, sizeof(buff))); assertEqualString(archive_error_string(a), - "Unsupported ZIP compression method (deflation)"); + "Unsupported ZIP compression method (8: deflation)"); assert(archive_errno(a) != 0); } -- cgit v1.2.1