Greg Geldorp : riched20/tests: Skip some tests on non-English platforms.
Alexandre Julliard
julliard at winehq.org
Wed Jan 19 11:46:16 CST 2011
Module: wine
Branch: master
Commit: bee48efdceb97d2585ebc026f36173d6bfaf67a4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=bee48efdceb97d2585ebc026f36173d6bfaf67a4
Author: Greg Geldorp <ggeldorp at vmware.com>
Date: Wed Jan 19 12:54:32 2011 +0100
riched20/tests: Skip some tests on non-English platforms.
---
dlls/riched20/tests/editor.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c
index 63b23e9..57827db 100644
--- a/dlls/riched20/tests/editor.c
+++ b/dlls/riched20/tests/editor.c
@@ -4822,6 +4822,7 @@ static void test_EM_FORMATRANGE(void)
HDC hdc;
HWND hwndRichEdit = new_richedit(NULL);
FORMATRANGE fr;
+ BOOL skip_non_english;
static const struct {
const char *string; /* The string */
int first; /* First 'pagebreak', 0 for don't care */
@@ -4834,6 +4835,10 @@ static void test_EM_FORMATRANGE(void)
{"WINE\r\n\r\nwine\r\nwine", 5, 6}
};
+ skip_non_english = (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_ENGLISH);
+ if (skip_non_english)
+ skip("Skipping some tests on non-English platform\n");
+
hdc = GetDC(hwndRichEdit);
ok(hdc != NULL, "Could not get HDC\n");
@@ -4895,7 +4900,8 @@ static void test_EM_FORMATRANGE(void)
fr.chrg.cpMax = -1;
r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, (LPARAM) &fr);
todo_wine {
- ok(fr.rc.bottom == (stringsize.cy * tpp_y), "Expected bottom to be %d, got %d\n", (stringsize.cy * tpp_y), fr.rc.bottom);
+ if (! skip_non_english)
+ ok(fr.rc.bottom == (stringsize.cy * tpp_y), "Expected bottom to be %d, got %d\n", (stringsize.cy * tpp_y), fr.rc.bottom);
}
if (fmtstrings[i].first)
todo_wine {
@@ -4911,7 +4917,7 @@ static void test_EM_FORMATRANGE(void)
todo_wine {
ok(r == fmtstrings[i].second, "Expected %d, got %d\n", fmtstrings[i].second, r);
}
- else
+ else if (! skip_non_english)
ok (r < len, "Expected < %d, got %d\n", len, r);
/* There is at least on more page, but we don't care */
More information about the wine-cvs
mailing list