From: Tim Kientzle <kientzle@acm.org>
Date: Wed, 27 May 2026 03:29:44 +0000 (-0700)
Subject: Merge pull request #3078 from vlmarek/solaris-skip-string-conversion-fail-tests
X-Git-Tag: v3.8.8~88
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb6abdbefbd1bc5eff3c6026b3501077bef0c120;p=thirdparty%2Flibarchive.git

Merge pull request #3078 from vlmarek/solaris-skip-string-conversion-fail-tests

Skip tests where Solaris iconv substitutes invalid chars

(cherry picked from commit 43a50356575b24c723ee44e55ae7693c62a2c2ee)
---

diff --git a/libarchive/test/test_archive_string_conversion.c b/libarchive/test/test_archive_string_conversion.c
index ecc39dffe..a726d9ae0 100644
--- a/libarchive/test/test_archive_string_conversion.c
+++ b/libarchive/test/test_archive_string_conversion.c
@@ -966,6 +966,10 @@ test_archive_string_conversion_fail_utf8_mbs(struct archive *a,
 DEFINE_TEST(test_archive_string_conversion_fail_c)
 {
 	struct archive *a;
+#if defined(__sun)
+	skipping("Solaris iconv substitutes unrepresentable UTF-8 characters");
+	return;
+#endif
 
 	/* Test the C locale by not calling setlocale.  */
 
@@ -983,6 +987,10 @@ DEFINE_TEST(test_archive_string_conversion_fail_latin1)
 {
 	struct archive *a;
 	struct archive_string_conv *sconv;
+#if defined(__sun)
+	skipping("Solaris iconv substitutes unrepresentable UTF-8 characters");
+	return;
+#endif
 
 	/* Test a Latin-1 locale.  */
 	if (