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-c32isblank.c | |
| parent | 84e26c587987e8484d55db4165f188b40c09e94b (diff) | |
| parent | 630f99f29bd31a76d8d24da2975a045452c763ef (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'tests/test-c32isblank.c')
| -rw-r--r-- | tests/test-c32isblank.c | 14 | 
1 files changed, 9 insertions, 5 deletions
diff --git a/tests/test-c32isblank.c b/tests/test-c32isblank.c index 0e722b25..a1d6d605 100644 --- a/tests/test-c32isblank.c +++ b/tests/test-c32isblank.c @@ -77,7 +77,9 @@ main (int argc, char *argv[])          #if !(defined __FreeBSD__ || defined __NetBSD__)          case '\v':          #endif +        #if !defined __NetBSD__          case '\f': +        #endif          case ' ': case '!': case '"': case '#': case '%':          case '&': case '\'': case '(': case ')': case '*':          case '+': case ',': case '-': case '.': case '/': @@ -114,7 +116,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.  */ @@ -128,7 +130,7 @@ main (int argc, char *argv[])            is = for_character ("\267", 1);            ASSERT (is == 0);          } -        return 0; +        return test_exit_status;        case '2':          /* Locale encoding is EUC-JP.  */ @@ -137,7 +139,7 @@ main (int argc, char *argv[])            is = for_character ("\241\243", 2);            ASSERT (is == 0);          } -        return 0; +        return test_exit_status;        case '3':          /* Locale encoding is UTF-8.  */ @@ -165,11 +167,13 @@ main (int argc, char *argv[])            is = for_character ("\363\240\200\240", 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 @@ -197,7 +201,7 @@ main (int argc, char *argv[])            is = for_character ("\323\066\231\060", 4);            ASSERT (is == 0);          } -        return 0; +        return test_exit_status;        }  | 
