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-c32islower.c | |
| parent | 84e26c587987e8484d55db4165f188b40c09e94b (diff) | |
| parent | 630f99f29bd31a76d8d24da2975a045452c763ef (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'tests/test-c32islower.c')
| -rw-r--r-- | tests/test-c32islower.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/tests/test-c32islower.c b/tests/test-c32islower.c index 3b799677..14a802f7 100644 --- a/tests/test-c32islower.c +++ b/tests/test-c32islower.c @@ -120,7 +120,7 @@ main (int argc, char *argv[]) { case '0': /* C locale; tested above. */ - return 0; + return test_exit_status; case '1': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -148,7 +148,7 @@ main (int argc, char *argv[]) is = for_character ("\377", 1); ASSERT (is != 0); } - return 0; + return test_exit_status; case '2': /* Locale encoding is EUC-JP. */ @@ -194,7 +194,7 @@ main (int argc, char *argv[]) ASSERT (is != 0); #endif } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -202,7 +202,7 @@ main (int argc, char *argv[]) /* U+00B2 SUPERSCRIPT TWO */ is = for_character ("\302\262", 2); ASSERT (is == 0); - #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__)) + #if !(defined __GLIBC__ || defined MUSL_LIBC || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__) || defined __ANDROID__) /* U+00B5 MICRO SIGN */ is = for_character ("\302\265", 2); ASSERT (is == 0); @@ -263,11 +263,13 @@ main (int argc, char *argv[]) is = for_character ("\363\240\201\241", 4); ASSERT (is == 0); } - return 0; + return test_exit_status; case '4': /* 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 @@ -275,7 +277,7 @@ main (int argc, char *argv[]) /* U+00B2 SUPERSCRIPT TWO */ is = for_character ("\201\060\205\065", 4); ASSERT (is == 0); - #if !(defined __GLIBC__ || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__) + #if !(defined __GLIBC__ || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __CYGWIN__) /* U+00B5 MICRO SIGN */ is = for_character ("\201\060\205\070", 4); ASSERT (is == 0); @@ -346,7 +348,7 @@ main (int argc, char *argv[]) is = for_character ("\323\066\237\065", 4); ASSERT (is == 0); } - return 0; + return test_exit_status; } |