diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2024-10-20 15:22:21 +0200 | 
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2024-10-20 15:22:21 +0200 | 
| commit | 1d8b9e17ea13630aec475484da09ebba0366f7c8 (patch) | |
| tree | 0c801f68561bfb0930a4ade80d7ca3a7940887ab /tests/test-c32rtomb.c | |
| parent | 84e26c587987e8484d55db4165f188b40c09e94b (diff) | |
| parent | 630f99f29bd31a76d8d24da2975a045452c763ef (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'tests/test-c32rtomb.c')
| -rw-r--r-- | tests/test-c32rtomb.c | 12 | 
1 files changed, 7 insertions, 5 deletions
| 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; | 
