shlwapi/tests: Enable the locale-dependent tests if the delimiters are correct.
This commit is contained in:
parent
bd35b0a122
commit
5f5c662a67
|
@ -720,8 +720,13 @@ static void test_SHUnicodeToUnicode(void)
|
||||||
|
|
||||||
START_TEST(string)
|
START_TEST(string)
|
||||||
{
|
{
|
||||||
|
TCHAR thousandDelim[8];
|
||||||
|
TCHAR decimalDelim[8];
|
||||||
CoInitialize(0);
|
CoInitialize(0);
|
||||||
|
|
||||||
|
GetLocaleInfo(GetUserDefaultLCID(), LOCALE_STHOUSAND, thousandDelim, 8);
|
||||||
|
GetLocaleInfo(GetUserDefaultLCID(), LOCALE_SDECIMAL, decimalDelim, 8);
|
||||||
|
|
||||||
hShlwapi = GetModuleHandleA("shlwapi");
|
hShlwapi = GetModuleHandleA("shlwapi");
|
||||||
if (!hShlwapi)
|
if (!hShlwapi)
|
||||||
return;
|
return;
|
||||||
|
@ -738,15 +743,11 @@ START_TEST(string)
|
||||||
test_StrToIntExA();
|
test_StrToIntExA();
|
||||||
test_StrToIntExW();
|
test_StrToIntExW();
|
||||||
test_StrDupA();
|
test_StrDupA();
|
||||||
if (0)
|
if (lstrcmp(thousandDelim, ",")==0 && lstrcmp(decimalDelim, ".")==0)
|
||||||
{
|
{
|
||||||
/* this test fails on locales which do not use '.' as a decimal separator */
|
/* these tests are locale-dependent */
|
||||||
test_StrFormatByteSize64A();
|
test_StrFormatByteSize64A();
|
||||||
|
|
||||||
/* this test fails on locales which do not use '.' as a decimal separator */
|
|
||||||
test_StrFormatKBSizeA();
|
test_StrFormatKBSizeA();
|
||||||
|
|
||||||
/* FIXME: Awaiting NLS fixes in kernel before these succeed */
|
|
||||||
test_StrFormatKBSizeW();
|
test_StrFormatKBSizeW();
|
||||||
}
|
}
|
||||||
test_StrFromTimeIntervalA();
|
test_StrFromTimeIntervalA();
|
||||||
|
|
Loading…
Reference in New Issue