From: Tobias Stoeckmann <tobias@stoeckmann.org>
Date: Tue, 3 Jun 2025 15:24:30 +0000 (+0200)
Subject: Skip zlib tests if support is missing
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2658%2Fhead;p=thirdparty%2Flibarchive.git

Skip zlib tests if support is missing

If zlib is not supported, do not run tests to avoid false positives.

Also adjust tests to support latest gzip versions (1.10+) which store
less information for improved reproducibility. The gzip binary is
used as a fallback if zlib is not available.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
---

diff --git a/libarchive/test/test_read_filter_gzip_recursive.c b/libarchive/test/test_read_filter_gzip_recursive.c
index 0042a0511..51b614b6c 100644
--- a/libarchive/test/test_read_filter_gzip_recursive.c
+++ b/libarchive/test/test_read_filter_gzip_recursive.c
@@ -29,8 +29,8 @@ DEFINE_TEST(test_read_filter_gzip_recursive)
 	const char *name = "test_read_filter_gzip_recursive.gz";
 	struct archive *a;
 
-	if (!canGzip()) {
-		skipping("gzip not available");
+	if (archive_zlib_version() == NULL) {
+		skipping("zlib not available");
 		return;
 	}
 
diff --git a/libarchive/test/test_read_set_format.c b/libarchive/test/test_read_set_format.c
index c760de005..f951d9f7b 100644
--- a/libarchive/test/test_read_set_format.c
+++ b/libarchive/test/test_read_set_format.c
@@ -138,7 +138,10 @@ DEFINE_TEST(test_read_append_filter)
     assertEqualInt(ARCHIVE_OK, archive_read_free(a));
     return;
   }
-  assertEqualIntA(a, ARCHIVE_OK, r);
+  if (r == ARCHIVE_WARN && canGzip())
+    assertEqualString(archive_error_string(a), "Using external gzip program");
+  else
+    assertEqualIntA(a, ARCHIVE_OK, r);
   assertEqualInt(ARCHIVE_OK,
       archive_read_open_memory(a, archive, sizeof(archive)));
   assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &ae));
diff --git a/libarchive/test/test_write_filter_gzip.c b/libarchive/test/test_write_filter_gzip.c
index 8fbdbed09..a6681d761 100644
--- a/libarchive/test/test_write_filter_gzip.c
+++ b/libarchive/test/test_write_filter_gzip.c
@@ -166,9 +166,15 @@ DEFINE_TEST(test_write_filter_gzip)
 	assertEqualInt(rbuff[0], 0x1f);
 	assertEqualInt(rbuff[1], 0x8b);
 	assertEqualInt(rbuff[2], 0x08);
-	assertEqualInt(rbuff[3], 0x08);
-	assertEqualInt(rbuff[8], 2); /* RFC 1952 flag for compression level 9 */
-	assertEqualString((const char*)rbuff+10, "testorgfilename");
+	/* RFC 1952 flag for compression level 9 */
+	assertEqualInt(rbuff[8], 2);
+	/* External gzip program might not save filename */
+	if (!use_prog || rbuff[3] == 0x08) {
+		assertEqualInt(rbuff[3], 0x08);
+		assertEqualString((const char*)rbuff+10, "testorgfilename");
+	} else {
+		assertEqualInt(rbuff[3], 0x00);
+	}
 
 	/* Curiously, this test fails; the test data above compresses
 	 * better at default compression than at level 9. */
diff --git a/libarchive/test/test_write_filter_gzip_timestamp.c b/libarchive/test/test_write_filter_gzip_timestamp.c
index a148f818d..d0496b025 100644
--- a/libarchive/test/test_write_filter_gzip_timestamp.c
+++ b/libarchive/test/test_write_filter_gzip_timestamp.c
@@ -81,8 +81,11 @@ DEFINE_TEST(test_write_filter_gzip_timestamp)
 	archive_entry_free(ae);
 	assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
 	assertEqualInt(ARCHIVE_OK, archive_write_free(a));
-	failure("Timestamp should be recorded");
-	assert(memcmp(buff + 4, "\x00\x00\x00\x00", 4) != 0);
+	/* External gzip program might not save timestamp */
+	if (!use_prog) {
+		failure("Timestamp should be recorded");
+		assert(memcmp(buff + 4, "\x00\x00\x00\x00", 4) != 0);
+	}
 
 	/* Test2: set "gzip:!timestamp" option. */
 	assert((a = archive_write_new()) != NULL);
diff --git a/unzip/test/test_C.c b/unzip/test/test_C.c
index 66835c840..d386bd61e 100644
--- a/unzip/test/test_C.c
+++ b/unzip/test/test_C.c
@@ -9,6 +9,7 @@
 /* Test C arg - match case-insensitive */
 DEFINE_TEST(test_C)
 {
+#ifdef HAVE_LIBZ
 	const char *reffile = "test_basic.zip";
 	int r;
 
@@ -19,4 +20,7 @@ DEFINE_TEST(test_C)
 	assertEmptyFile("test.err");
 
 	assertTextFileContents("contents CAPS\n", "test_basic/CAPS");
+#else
+	skipping("zlib not available");
+#endif
 }
diff --git a/unzip/test/test_L.c b/unzip/test/test_L.c
index 5b004d5d5..85b43f592 100644
--- a/unzip/test/test_L.c
+++ b/unzip/test/test_L.c
@@ -9,6 +9,7 @@
 /* Test L arg - make names lowercase */
 DEFINE_TEST(test_L)
 {
+#ifdef HAVE_LIBZ
 	const char *reffile = "test_basic.zip";
 	int r;
 
@@ -22,4 +23,7 @@ DEFINE_TEST(test_L)
 	assertTextFileContents("contents b\n", "test_basic/b");
 	assertTextFileContents("contents c\n", "test_basic/c");
 	assertTextFileContents("contents CAPS\n", "test_basic/caps");
+#else
+	skipping("zlib not available");
+#endif
 }
diff --git a/unzip/test/test_basic.c b/unzip/test/test_basic.c
index 1f37dcd41..3a884aa30 100644
--- a/unzip/test/test_basic.c
+++ b/unzip/test/test_basic.c
@@ -9,6 +9,7 @@
 /* This test just does a basic zip decompression */
 DEFINE_TEST(test_basic)
 {
+#ifdef HAVE_LIBZ
 	const char *reffile = "test_basic.zip";
 	int r;
 
@@ -22,4 +23,7 @@ DEFINE_TEST(test_basic)
 	assertTextFileContents("contents b\n", "test_basic/b");
 	assertTextFileContents("contents c\n", "test_basic/c");
 	assertTextFileContents("contents CAPS\n", "test_basic/CAPS");
+#else
+	skipping("zlib not available");
+#endif
 }
diff --git a/unzip/test/test_d.c b/unzip/test/test_d.c
index ea6724620..cd7c3dfd9 100644
--- a/unzip/test/test_d.c
+++ b/unzip/test/test_d.c
@@ -9,6 +9,7 @@
 /* Test d arg - extract to target dir - before zipfile argument */
 DEFINE_TEST(test_d_before_zipfile)
 {
+#ifdef HAVE_LIBZ
 	const char *reffile = "test_basic.zip";
 	int r;
 
@@ -22,11 +23,15 @@ DEFINE_TEST(test_d_before_zipfile)
 	assertTextFileContents("contents b\n", "foobar/test_basic/b");
 	assertTextFileContents("contents c\n", "foobar/test_basic/c");
 	assertTextFileContents("contents CAPS\n", "foobar/test_basic/CAPS");
+#else
+	skipping("zlib not available");
+#endif
 }
 
 /* Test d arg - extract to target dir - after zipfile argument */
 DEFINE_TEST(test_d_after_zipfile)
 {
+#ifdef HAVE_LIBZ
 	const char *reffile = "test_basic.zip";
 	int r;
 
@@ -40,4 +45,7 @@ DEFINE_TEST(test_d_after_zipfile)
 	assertTextFileContents("contents b\n", "foobar/test_basic/b");
 	assertTextFileContents("contents c\n", "foobar/test_basic/c");
 	assertTextFileContents("contents CAPS\n", "foobar/test_basic/CAPS");
+#else
+	skipping("zlib not available");
+#endif
 }
diff --git a/unzip/test/test_doubledash.c b/unzip/test/test_doubledash.c
index 4467213db..db0445ec3 100644
--- a/unzip/test/test_doubledash.c
+++ b/unzip/test/test_doubledash.c
@@ -9,6 +9,7 @@
 /* Test double dash arg - swallow "--" and use next argument as file name  */
 DEFINE_TEST(test_doubledash)
 {
+#ifdef HAVE_LIBZ
 	const char *reffile = "test_basic.zip";
 	int r;
 
@@ -22,4 +23,7 @@ DEFINE_TEST(test_doubledash)
 	assertTextFileContents("contents b\n", "test_basic/b");
 	assertTextFileContents("contents c\n", "test_basic/c");
 	assertTextFileContents("contents CAPS\n", "test_basic/CAPS");
+#else
+	skipping("zlib not available");
+#endif
 }
diff --git a/unzip/test/test_glob.c b/unzip/test/test_glob.c
index b53aa16fd..589ff1c55 100644
--- a/unzip/test/test_glob.c
+++ b/unzip/test/test_glob.c
@@ -9,6 +9,7 @@
 /* Test that the glob works */
 DEFINE_TEST(test_glob)
 {
+#ifdef HAVE_LIBZ
 	const char *reffile = "test_basic.zip";
 	int r;
 
@@ -22,4 +23,7 @@ DEFINE_TEST(test_glob)
 	assertTextFileContents("contents b\n", "test_basic/b");
 	assertFileNotExists("test_basic/c");
 	assertFileNotExists("test_basic/CAPS");
+#else
+	skipping("zlib not available");
+#endif
 }
diff --git a/unzip/test/test_j.c b/unzip/test/test_j.c
index b87229f42..1fba8ca20 100644
--- a/unzip/test/test_j.c
+++ b/unzip/test/test_j.c
@@ -9,6 +9,7 @@
 /* Test j arg - don't make directories */
 DEFINE_TEST(test_j)
 {
+#ifdef HAVE_LIBZ
 	const char *reffile = "test_basic.zip";
 	int r;
 
@@ -22,4 +23,7 @@ DEFINE_TEST(test_j)
 	assertTextFileContents("contents b\n", "b");
 	assertTextFileContents("contents c\n", "c");
 	assertTextFileContents("contents CAPS\n", "CAPS");
+#else
+	skipping("zlib not available");
+#endif
 }
diff --git a/unzip/test/test_n.c b/unzip/test/test_n.c
index bb75c5d76..a13623ce2 100644
--- a/unzip/test/test_n.c
+++ b/unzip/test/test_n.c
@@ -9,6 +9,7 @@
 /* Test n arg - don't overwrite existing files */
 DEFINE_TEST(test_n)
 {
+#ifdef HAVE_LIBZ
 	const char *reffile = "test_basic.zip";
 	int r;
 
@@ -26,4 +27,7 @@ DEFINE_TEST(test_n)
 	assertTextFileContents("orig b\n", "test_basic/b");
 	assertTextFileContents("contents c\n", "test_basic/c");
 	assertTextFileContents("contents CAPS\n", "test_basic/CAPS");
+#else
+	skipping("zlib not available");
+#endif
 }
diff --git a/unzip/test/test_o.c b/unzip/test/test_o.c
index 64f946774..8c48348c4 100644
--- a/unzip/test/test_o.c
+++ b/unzip/test/test_o.c
@@ -9,6 +9,7 @@
 /* Test o arg - overwrite existing files */
 DEFINE_TEST(test_o)
 {
+#ifdef HAVE_LIBZ
 	const char *reffile = "test_basic.zip";
 	int r;
 
@@ -25,4 +26,7 @@ DEFINE_TEST(test_o)
 	assertTextFileContents("contents b\n", "test_basic/b");
 	assertTextFileContents("contents c\n", "test_basic/c");
 	assertTextFileContents("contents CAPS\n", "test_basic/CAPS");
+#else
+	skipping("zlib not available");
+#endif
 }
diff --git a/unzip/test/test_p.c b/unzip/test/test_p.c
index 8bfffbe5d..13a776546 100644
--- a/unzip/test/test_p.c
+++ b/unzip/test/test_p.c
@@ -9,6 +9,7 @@
 /* Test p arg - Print to stdout */
 DEFINE_TEST(test_p)
 {
+#ifdef HAVE_LIBZ
 	const char *reffile = "test_basic.zip";
 	int r;
 
@@ -17,4 +18,7 @@ DEFINE_TEST(test_p)
 	assertEqualInt(0, r);
 	assertTextFileContents("contents a\ncontents b\ncontents c\ncontents CAPS\n", "test.out");
 	assertEmptyFile("test.err");
+#else
+	skipping("zlib not available");
+#endif
 }
diff --git a/unzip/test/test_q.c b/unzip/test/test_q.c
index 13222a483..0579e8028 100644
--- a/unzip/test/test_q.c
+++ b/unzip/test/test_q.c
@@ -9,6 +9,7 @@
 /* Test q arg - Quiet */
 DEFINE_TEST(test_q)
 {
+#ifdef HAVE_LIBZ
 	const char *reffile = "test_basic.zip";
 	int r;
 
@@ -22,4 +23,7 @@ DEFINE_TEST(test_q)
 	assertTextFileContents("contents b\n", "test_basic/b");
 	assertTextFileContents("contents c\n", "test_basic/c");
 	assertTextFileContents("contents CAPS\n", "test_basic/CAPS");
+#else
+	skipping("zlib not available");
+#endif
 }
diff --git a/unzip/test/test_singlefile.c b/unzip/test/test_singlefile.c
index a72811f04..a5a35ecac 100644
--- a/unzip/test/test_singlefile.c
+++ b/unzip/test/test_singlefile.c
@@ -9,6 +9,7 @@
 /* Ensure single-file zips work */
 DEFINE_TEST(test_singlefile)
 {
+#ifdef HAVE_LIBZ
 	const char *reffile = "test_singlefile.zip";
 	int r;
 
@@ -19,4 +20,7 @@ DEFINE_TEST(test_singlefile)
 	assertEmptyFile("test.err");
 
 	assertTextFileContents("hello\n", "file.txt");
+#else
+	skipping("zlib not available");
+#endif
 }
diff --git a/unzip/test/test_t.c b/unzip/test/test_t.c
index 55a516fc6..756583091 100644
--- a/unzip/test/test_t.c
+++ b/unzip/test/test_t.c
@@ -9,6 +9,7 @@
 /* Test t arg - Test zip contents */
 DEFINE_TEST(test_t)
 {
+#ifdef HAVE_LIBZ
 	const char *reffile = "test_basic.zip";
 	int r;
 
@@ -17,4 +18,7 @@ DEFINE_TEST(test_t)
 	assertEqualInt(0, r);
 	assertNonEmptyFile("test.out");
 	assertEmptyFile("test.err");
+#else
+	skipping("zlib not available");
+#endif
 }
diff --git a/unzip/test/test_x.c b/unzip/test/test_x.c
index 959beb195..43a2085dc 100644
--- a/unzip/test/test_x.c
+++ b/unzip/test/test_x.c
@@ -9,6 +9,7 @@
 /* Test x arg with single exclude path */
 DEFINE_TEST(test_x_single)
 {
+#ifdef HAVE_LIBZ
 	const char *reffile = "test_basic.zip";
 	int r;
 
@@ -22,11 +23,15 @@ DEFINE_TEST(test_x_single)
 	assertTextFileContents("contents b\n", "test_basic/b");
 	assertFileNotExists("test_basic/c");
 	assertTextFileContents("contents CAPS\n", "test_basic/CAPS");
+#else
+	skipping("zlib not available");
+#endif
 }
 
 /* Test x arg with multiple exclude paths */
 DEFINE_TEST(test_x_multiple)
 {
+#ifdef HAVE_LIBZ
 	const char *reffile = "test_basic.zip";
 	int r;
 
@@ -40,11 +45,15 @@ DEFINE_TEST(test_x_multiple)
 	assertFileNotExists("test_basic/b");
 	assertFileNotExists("test_basic/c");
 	assertTextFileContents("contents CAPS\n", "test_basic/CAPS");
+#else
+	skipping("zlib not available");
+#endif
 }
 
 /* Test x arg with multiple exclude paths and a d arg afterwards */
 DEFINE_TEST(test_x_multiple_with_d)
 {
+#ifdef HAVE_LIBZ
 	const char *reffile = "test_basic.zip";
 	int r;
 
@@ -58,4 +67,7 @@ DEFINE_TEST(test_x_multiple_with_d)
 	assertFileNotExists("foobar/test_basic/b");
 	assertFileNotExists("foobar/test_basic/c");
 	assertTextFileContents("contents CAPS\n", "foobar/test_basic/CAPS");
+#else
+	skipping("zlib not available");
+#endif
 }