Detlef Riekenberg : shlwapi/tests: Run more language dependent tests only on English locales.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6e079915dd95e84a653c1c6b0f6a11a3ada3876b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6e079915dd95e84a653c1c6b0f...

Author: Detlef Riekenberg <wine.dev(a)web.de>
Date:   Fri Aug 13 22:51:44 2010 +0200

shlwapi/tests: Run more language dependent tests only on English locales.

---

 dlls/shlwapi/tests/string.c |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c
index aa97088..00a4469 100644
--- a/dlls/shlwapi/tests/string.c
+++ b/dlls/shlwapi/tests/string.c
@@ -1421,19 +1421,17 @@ START_TEST(string)
   test_StrToIntExA();
   test_StrToIntExW();
   test_StrDupA();
-  if (lstrcmp(thousandDelim, ",")==0 && lstrcmp(decimalDelim, ".")==0)
-  {
-    /* these tests are locale-dependent */
-    test_StrFormatByteSize64A();
-    test_StrFormatKBSizeA();
-    test_StrFormatKBSizeW();
-  }
 
   /* language-dependent test */
   if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_ENGLISH)
-    trace("Skipping StrFromTimeInterval test for non English language\n");
+    skip("English is required for StrFromTimeInterval and StrFormat*Size tests\n");
   else
+  {
+    test_StrFormatByteSize64A();
+    test_StrFormatKBSizeA();
+    test_StrFormatKBSizeW();
     test_StrFromTimeIntervalA();
+  }
 
   test_StrCmpA();
   test_StrCmpW();