Detlef Riekenberg : kernel32/tests: Skip tests on non-English systems.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8f1a3604ac15dc9d06cf4733f2353fe780a2c08d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8f1a3604ac15dc9d06cf4733f2...

Author: Detlef Riekenberg 
Date:   Mon Feb 11 00:03:30 2013 +0100

kernel32/tests: Skip tests on non-English systems.

---

dlls/kernel32/tests/locale.c |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index ebd7278..e9c83b8 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -280,11 +280,23 @@ static void test_GetLocaleInfoW(void)

ret = GetLocaleInfoW(lcid_en_neut, LOCALE_SCOUNTRY, bufferW, COUNTOF(bufferW));
       ok(ret, "got %d\n", ret);
-      ok(!lstrcmpW(statesW, bufferW), "got wrong name %s\n", wine_dbgstr_w(bufferW));
+      if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) ||
+          (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH))
+      {
+          skip("Non-English locale\n");
+      }
+      else
+          ok(!lstrcmpW(statesW, bufferW), "got wrong name %s\n", wine_dbgstr_w(bufferW));

ret = GetLocaleInfoW(lcid_en_neut, LOCALE_SLANGUAGE, bufferW, COUNTOF(bufferW));
       ok(ret, "got %d\n", ret);
-      ok(!lstrcmpW(slangW, bufferW), "got wrong name %s\n", wine_dbgstr_w(bufferW));
+      if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) ||
+          (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH))
+      {
+          skip("Non-English locale\n");
+      }
+      else
+          ok(!lstrcmpW(slangW, bufferW), "got wrong name %s\n", wine_dbgstr_w(bufferW));

while (*ptr->name)
       {
@@ -3434,7 +3446,13 @@ static void test_GetLocaleInfoEx(void)

ret = pGetLocaleInfoEx(enW, LOCALE_SCOUNTRY, bufferW, sizeof(bufferW)/sizeof(WCHAR));
         ok(ret == lstrlenW(bufferW)+1, "got %d\n", ret);
-        ok(!lstrcmpW(bufferW, statesW), "got %s\n", wine_dbgstr_w(bufferW));
+        if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) ||
+            (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH))
+        {
+            skip("Non-English locale\n");
+        }
+        else
+            ok(!lstrcmpW(bufferW, statesW), "got %s\n", wine_dbgstr_w(bufferW));

bufferW[0] = 0;
         SetLastError(0xdeadbeef);