From 95f081ca27937640da1b42950d1039ec1635d7b4 Mon Sep 17 00:00:00 2001
From: Martin Matuska <martin@matuska.de>
Date: Tue, 22 Oct 2024 13:31:58 +0200
Subject: [PATCH] Fix tests added in #2284

Fixes the case when bzip2, lzma or zstd compressions are not supported.
---
 libarchive/test/test_write_format_zip_compression_bzip2.c  | 6 +++++-
 libarchive/test/test_write_format_zip_compression_lzmaxz.c | 7 ++++++-
 libarchive/test/test_write_format_zip_compression_zstd.c   | 7 ++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/libarchive/test/test_write_format_zip_compression_bzip2.c b/libarchive/test/test_write_format_zip_compression_bzip2.c
index ebc2b740ba..2b93d24d3d 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 72b9faf1a6..efc65fdc30 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 22c30ef248..e846c388c7 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
+