From 4682deeb62247d34de87f8e777f99e2d337fd377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff.email>
Date: Sun, 20 Oct 2024 15:21:43 +0200
Subject: New upstream version 1.3

---
 tests/test-c32rtomb.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'tests/test-c32rtomb.c')

diff --git a/tests/test-c32rtomb.c b/tests/test-c32rtomb.c
index c33d08d3..c02657c6 100644
--- a/tests/test-c32rtomb.c
+++ b/tests/test-c32rtomb.c
@@ -120,7 +120,7 @@ main (int argc, char *argv[])
       {
       case '1':
         /* C locale; tested above.  */
-        return 0;
+        return test_exit_status;
 
       case '2':
         /* Locale encoding is ISO-8859-1 or ISO-8859-15.  */
@@ -130,7 +130,7 @@ main (int argc, char *argv[])
           check_character (input + 1, 1);
           check_character (input + 2, 1);
         }
-        return 0;
+        return test_exit_status;
 
       case '3':
         /* Locale encoding is UTF-8.  */
@@ -141,7 +141,7 @@ main (int argc, char *argv[])
           check_character (input + 3, 2);
           check_character (input + 5, 4);
         }
-        return 0;
+        return test_exit_status;
 
       case '4':
         /* Locale encoding is EUC-JP.  */
@@ -152,11 +152,13 @@ main (int argc, char *argv[])
           check_character (input + 3, 2);
           check_character (input + 5, 2);
         }
-        return 0;
+        return test_exit_status;
 
       case '5':
         /* Locale encoding is GB18030.  */
         #if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 13 && __GLIBC_MINOR__ <= 15) || (GL_CHAR32_T_IS_UNICODE && (defined __FreeBSD__ || defined __NetBSD__ || defined __sun))
+        if (test_exit_status != EXIT_SUCCESS)
+          return test_exit_status;
         fputs ("Skipping test: The GB18030 converter in this system's iconv is broken.\n", stderr);
         return 77;
         #endif
@@ -167,7 +169,7 @@ main (int argc, char *argv[])
           check_character (input + 3, 4);
           check_character (input + 7, 4);
         }
-        return 0;
+        return test_exit_status;
       }
 
   return 1;
-- 
cgit v1.2.3