From: Martin Matuska <martin@matuska.de>
Date: Wed, 23 Oct 2024 16:47:32 +0000 (+0200)
Subject: Fix tests added in #2284 (#2387)
X-Git-Tag: v3.8.0~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=043b6feeefffbfda4327b728a1fa17107b6bfd53;p=thirdparty%2Flibarchive.git

Fix tests added in #2284 (#2387)
---

diff --git a/libarchive/test/test_write_format_zip_compression_bzip2.c b/libarchive/test/test_write_format_zip_compression_bzip2.c
index ebc2b740b..2b93d24d3 100644
--- a/libarchive/test/test_write_format_zip_compression_bzip2.c
+++ b/libarchive/test/test_write_format_zip_compression_bzip2.c
@@ -343,8 +343,12 @@ static void verify_bzip2_contents(const char *buff, size_t used)
 	archive_read_free(zip_archive);
 }
 
+#endif /* HAVE_BZLIB_H */
 DEFINE_TEST(test_write_format_zip_compression_bzip2)
 {
+#ifndef HAVE_BZLIB_H
+	skipping("bzip2 is not fully supported on this platform");
+#else /* HAVE_BZLIB_H */
 	/* Buffer data */
 	struct archive *a;
 	char buff[100000];
@@ -398,5 +402,5 @@ DEFINE_TEST(test_write_format_zip_compression_bzip2)
 	dumpfile("constructed.zip", buff, used);
 
 	verify_bzip2_contents(buff, used);
+#endif /* HAVE_BZLIB_H */
 }
-#endif
diff --git a/libarchive/test/test_write_format_zip_compression_lzmaxz.c b/libarchive/test/test_write_format_zip_compression_lzmaxz.c
index 72b9faf1a..efc65fdc3 100644
--- a/libarchive/test/test_write_format_zip_compression_lzmaxz.c
+++ b/libarchive/test/test_write_format_zip_compression_lzmaxz.c
@@ -328,8 +328,12 @@ static void verify_lzma_contents(const char *buff, size_t used)
 	verify_xz_lzma(buff, used, 14, 0xA);
 }
 
+#endif /* HAVE_LZMA_H */
 DEFINE_TEST(test_write_format_zip_compression_lzmaxz)
 {
+#ifndef HAVE_LZMA_H
+	skipping("lzma is not fully supported on this platform");
+#else /* HAVE_LZMA_H */
 	/* Buffer data */
 	struct archive *a;
 	char buff[100000];
@@ -434,5 +438,6 @@ DEFINE_TEST(test_write_format_zip_compression_lzmaxz)
 	dumpfile("constructed.zip", buff, used);
 
 	verify_xz_contents(buff, used);
+#endif /* HAVE_LZMA_H */
 }
-#endif
+
diff --git a/libarchive/test/test_write_format_zip_compression_zstd.c b/libarchive/test/test_write_format_zip_compression_zstd.c
index 22c30ef24..e846c388c 100644
--- a/libarchive/test/test_write_format_zip_compression_zstd.c
+++ b/libarchive/test/test_write_format_zip_compression_zstd.c
@@ -343,8 +343,12 @@ static void verify_zstd_contents(const char *buff, size_t used)
 	archive_read_free(zip_archive);
 }
 
+#endif /* HAVE_ZSTD_H */
 DEFINE_TEST(test_write_format_zip_compression_zstd)
 {
+#ifndef HAVE_ZSTD_H
+	skipping("zstd is not fully supported on this platform");
+#else /* HAVE_ZSTD_H */
 	/* Buffer data */
 	struct archive *a;
 	char buff[100000];
@@ -401,5 +405,6 @@ DEFINE_TEST(test_write_format_zip_compression_zstd)
 	dumpfile("constructed.zip", buff, used);
 
 	verify_zstd_contents(buff, used);
+#endif /* HAVE_ZSTD_H */
 }
-#endif
+