[PATCH v2] user32/tests: Skip some tests with inconsistent results with non-us kbd.

Rémi Bernon rbernon at codeweavers.com
Wed Oct 23 06:09:30 CDT 2019


See the same binary being tested twice here:
* https://testbot.winehq.org/JobDetails.pl?Key=58277
* https://testbot.winehq.org/JobDetails.pl?Key=58278

Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
v2: This was PATCH 4/4 of the previous series for user32/tests, it's now
doing what it was supposed to do.

It would be better to fix the inconsistencies, but in the meantime this
creates noise on testbot.

 dlls/user32/tests/input.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
index 130ce49bb57..c5cf9556ede 100644
--- a/dlls/user32/tests/input.c
+++ b/dlls/user32/tests/input.c
@@ -284,6 +284,13 @@ static BOOL TestASet( HWND hWnd, int nrkev, const KEV kevdwn[], const KEV kevup[
     int i,j,k,l,m,n;
     static int count=0;
     KEV kbuf[MAXKEYEVENTS];
+    BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409);
+    if (!us_kbd)
+    {
+        win_skip( "skipping test with inconsistent results on non-us keyboard\n" );
+        return TRUE;
+    }
+
     assert( nrkev==2 || nrkev==3);
     for(i=0;i<MAXKEYEVENTS;i++) kbuf[i]=0;
     /* two keys involved gives 4 test cases */
@@ -1184,6 +1191,12 @@ static void test_Input_unicode(void)
     HHOOK hook;
     HMODULE hModuleImm32;
     BOOL (WINAPI *pImmDisableIME)(DWORD);
+    BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409);
+    if (!us_kbd)
+    {
+        win_skip( "skipping test with inconsistent results on non-us keyboard\n" );
+        return;
+    }

     wclass.lpszClassName = classNameW;
     wclass.style         = CS_HREDRAW | CS_VREDRAW;
--
2.24.0.rc0




More information about the wine-devel mailing list