From d2cda58a1f7780d26ad0fef2edd79453f6740e22 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Fri, 9 Jul 2010 11:38:08 +0200 Subject: [PATCH] msvcrt/tests: Add some alternative locale names that happen on Windows. --- dlls/msvcrt/tests/locale.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index cf51c4c7eed..2496ebc7a94 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -117,7 +117,8 @@ static void test_setlocale(void) ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) todo_wine ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") - || broken(!strcmp(ret, "Chinese_People's Republic of China.936")), "ret = %s\n", ret); + || broken(!strcmp(ret, "Chinese_People's Republic of China.936")) + || broken(!strcmp(ret, "Chinese_Taiwan.950")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "chinese-traditional"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); @@ -439,12 +440,14 @@ static void test_setlocale(void) ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) ok(!strcmp(ret, "Norwegian (Bokmål)_Norway.1252") + || broken(!strcmp(ret, "Norwegian (Bokmal)_Norway.1252")) || broken(!strcmp(ret, "Norwegian_Norway.1252")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "norwegian-bokmal"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) ok(!strcmp(ret, "Norwegian (Bokmål)_Norway.1252") + || broken(!strcmp(ret, "Norwegian (Bokmal)_Norway.1252")) || broken(!strcmp(ret, "Norwegian_Norway.1252")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "norwegian-nynorsk"); @@ -453,6 +456,7 @@ static void test_setlocale(void) todo_wine ok(!strcmp(ret, "Norwegian-Nynorsk_Norway.1252") || broken(!strcmp(ret, "Norwegian_Norway.1252")) || broken(!strcmp(ret, "Norwegian (Nynorsk)_Norway.1252")) + || broken(!strcmp(ret, "Norwegian (Bokmal)_Norway.1252")) || broken(!strcmp(ret, "Norwegian (Bokmål)_Norway.1252")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "plk"); -- 2.11.4.GIT