[PATCH] shlwapi/tests: Run more language dependent tests only on english systems

Detlef Riekenberg wine.dev at web.de
Fri Aug 13 15:51:44 CDT 2010


Current tests use "bytes", as well as KB, MB, GB, ...
This patch fixes failures for the winetestbot systems

Tested with Wine (with all en_* and de_* on my system) and Windows
(winetestbot: http://testbot.winehq.org/JobDetails.pl?Key=4438 )

--
By by ... Detlef
---
 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();
-- 
1.7.0.4




More information about the wine-patches mailing list