[PATCH 0/1] MR7401: comctl32/tests: Skip a few tests in non-english locale.
[Testbot shows this tests failing](https://test.winehq.org/data/patterns.html#comctl32:syslink) since commit https://gitlab.winehq.org/wine/wine/-/commit/c95c129ea1199d06280a2d71020a147..., because native returns translations of "Click". As template I used this example: [dlls/advapi32/tests/security.c#L2578](https://gitlab.winehq.org/wine/wine/-/blob/master/dlls/advapi32/tests/securi...) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7401
From: Bernhard Übelacker <bernhardu(a)mailbox.org> --- dlls/comctl32/tests/syslink.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/syslink.c b/dlls/comctl32/tests/syslink.c index e8a76f8a5ae..65909774d19 100644 --- a/dlls/comctl32/tests/syslink.c +++ b/dlls/comctl32/tests/syslink.c @@ -374,8 +374,15 @@ todo_wine { ok(hr == S_OK, "accDefaultAction failed, hr=%lx\n", hr); if (SUCCEEDED(hr)) { - ok(!!name && !wcscmp(name, L"Click"), - "unexpected name %s\n", debugstr_w(name)); + if (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH) + { + skip("Non-English locale (test with hardcoded 'Click')\n"); + } + else + { + ok(!!name && !wcscmp(name, L"Click"), + "unexpected name %s\n", debugstr_w(name)); + } SysFreeString(name); } @@ -413,8 +420,15 @@ todo_wine { ok(hr == S_OK, "accDefaultAction failed, hr=%lx\n", hr); if (SUCCEEDED(hr)) { - ok(!!name && !wcscmp(name, L"Click"), - "unexpected name %s\n", debugstr_w(name)); + if (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH) + { + skip("Non-English locale (test with hardcoded 'Click')\n"); + } + else + { + ok(!!name && !wcscmp(name, L"Click"), + "unexpected name %s\n", debugstr_w(name)); + } SysFreeString(name); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7401
This merge request was approved by Zhiyi Zhang. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7401
participants (2)
-
Bernhard Übelacker -
Zhiyi Zhang (@zhiyi)