[PATCH] user32/tests: Skip monitor tests with modes larger than original.

Rémi Bernon rbernon at codeweavers.com
Fri Aug 7 05:35:13 CDT 2020


This seems to cause a lot of timeouts on the testbot, for some reason.

Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---

Clearly this is not ideal, but it looks like the timeouts weren't
completely fixed by the update. In particular the 32bit runs are still
failing.

 dlls/user32/tests/monitor.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c
index 85fb2f080a7..3809221f76c 100644
--- a/dlls/user32/tests/monitor.c
+++ b/dlls/user32/tests/monitor.c
@@ -627,6 +627,12 @@ static void test_ChangeDisplaySettingsEx(void)
         dm.dmSize = sizeof(dm);
         for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm, 0); ++mode)
         {
+            if (dm.dmPelsWidth > devices[0].original_mode.dmPelsWidth || dm.dmPelsHeight > devices[0].original_mode.dmPelsHeight)
+            {
+                trace("skipping display mode %s %dx%d@%d\n", devices[device].name, dm.dmPelsWidth, dm.dmPelsHeight, dm.dmDisplayFrequency);
+                continue;
+            }
+
             dm.dmPosition = position;
             dm.dmFields |= DM_POSITION;
             res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_RESET, NULL);
-- 
2.27.0




More information about the wine-devel mailing list