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 ecc39dffea7f874870d8be578c53b7d75a2e89ac..a726d9ae044329ed6310fe2d4dc705a754a4f37e 100644 (file)
--- 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 (