diff options
Diffstat (limited to 'tests/test-c32ispunct.c')
| -rw-r--r-- | tests/test-c32ispunct.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/tests/test-c32ispunct.c b/tests/test-c32ispunct.c index 1b9f8e3b..35f05788 100644 --- a/tests/test-c32ispunct.c +++ b/tests/test-c32ispunct.c @@ -145,7 +145,7 @@ main (int argc, char *argv[]) ASSERT (is != 0); is = for_character ("`", 1); ASSERT (is != 0); - return 0; + return test_exit_status; case '1': /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ @@ -167,7 +167,7 @@ main (int argc, char *argv[]) is = for_character ("\337", 1); ASSERT (is == 0); } - return 0; + return test_exit_status; case '2': /* Locale encoding is EUC-JP. */ @@ -208,7 +208,7 @@ main (int argc, char *argv[]) is = for_character ("\243\355", 2); ASSERT (is == 0); } - return 0; + return test_exit_status; case '3': /* Locale encoding is UTF-8. */ @@ -255,17 +255,19 @@ main (int argc, char *argv[]) is = for_character ("\360\235\204\200", 4); ASSERT (is != 0); #endif - #if !(defined __GLIBC__ || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__)) + #if !(defined __GLIBC__ || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined _AIX || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__) || defined __ANDROID__) /* U+E003A TAG COLON */ is = for_character ("\363\240\200\272", 4); ASSERT (is == 0); #endif } - 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[]) is = for_character ("\201\060\206\067", 4); ASSERT (is != 0); #endif - #if !(defined __FreeBSD__ || defined __DragonFly__) + #if !(defined __FreeBSD__ || defined __DragonFly__ || defined __sun) /* U+00D7 MULTIPLICATION SIGN */ is = for_character ("\241\301", 2); ASSERT (is != 0); @@ -294,7 +296,7 @@ main (int argc, char *argv[]) is = for_character ("\201\060\374\067", 4); ASSERT (is != 0); #endif - #if !(defined __FreeBSD__ || defined __DragonFly__) + #if !(defined __FreeBSD__ || defined __DragonFly__ || defined __sun) /* U+2192 RIGHTWARDS ARROW */ is = for_character ("\241\372", 2); ASSERT (is != 0); @@ -316,13 +318,13 @@ main (int argc, char *argv[]) is = for_character ("\224\062\273\064", 4); ASSERT (is != 0); #endif - #if !(defined __GLIBC__ || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__) + #if !(defined __GLIBC__ || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __CYGWIN__) /* U+E003A TAG COLON */ is = for_character ("\323\066\233\066", 4); ASSERT (is == 0); #endif } - return 0; + return test_exit_status; } |