github-mirror/libarchive
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2967 from bgilbert/deflate

Browse Source 
Fix `test_write_filter_gzip` on Ubuntu s390x

(cherry picked from commit 983e1edcdd)
This commit is contained in:
Martin Matuška authored and Martin Matuska committed 2026-06-23 11:01:41 +02:00
1 parent 160540487d
commit c11e709cf4
1 file changed
+10 -7
Download Patch File Download Diff File Expand all files Collapse all files
libarchive/test/test_write_filter_gzip.c
+10 -7
View File
@@ -40,7 +40,7 @@ DEFINE_TEST(test_write_filter_gzip)
size_t buffsize, datasize;
unsigned char *rbuff;
char path[16];
size_t used1, used2;
size_t used1, used2, used3;
int i, r, use_prog = 0;
buffsize = 2000000;
@@ -218,7 +218,7 @@ DEFINE_TEST(test_write_filter_gzip)
assertEqualIntA(a, ARCHIVE_OK,
archive_write_set_filter_option(a, NULL, "compression-level", "1"));
assertEqualIntA(a, ARCHIVE_OK,
archive_write_open_memory(a, buff, buffsize, &used2));
archive_write_open_memory(a, buff, buffsize, &used3));
for (i = 0; i < 100; i++) {
snprintf(path, sizeof(path), "file%03d", i);
assert((ae = archive_entry_new()) != NULL);
@@ -234,10 +234,13 @@ DEFINE_TEST(test_write_filter_gzip)
assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
assertEqualInt(ARCHIVE_OK, archive_write_free(a));
/* Level 1 really does result in larger data. */
failure("Compression-level=1 wrote %d bytes; default wrote %d bytes",
(int)used2, (int)used1);
assert(used2 > used1);
/* Level 1 really does result in larger data than level 9.
* We can't compare levels 1 and 6 because those produce identical
* results on Ubuntu s390x, since Ubuntu configures both levels to
* use DFLTCC hardware compression. */
failure("Compression-level=1 wrote %d bytes; compression-level=9 wrote %d bytes",
(int)used3, (int)used2);
assert(used3 > used2);
/* Basic gzip header tests */
rbuff = (unsigned char *)buff;
@@ -255,7 +258,7 @@ DEFINE_TEST(test_write_filter_gzip)
skipping("gzip reading not fully supported on this platform");
} else {
assertEqualIntA(a, ARCHIVE_OK,
archive_read_open_memory(a, buff, used2));
archive_read_open_memory(a, buff, used3));
for (i = 0; i < 100; i++) {
snprintf(path, sizeof(path), "file%03d", i);
if (!assertEqualInt(ARCHIVE_OK,