[PATCH 4/4] dxgi/tests: Don't run the 32-bit tests multithreaded.
From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v4: Modify "use_mt" instead of run_queued_tests(). This supersedes patch 225752. dlls/dxgi/tests/dxgi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index a83964d75233..f70d849aebc9 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -7595,6 +7595,11 @@ START_TEST(dxgi) ok(EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, ®istry_mode), "Failed to get display mode.\n"); use_mt = !getenv("WINETEST_NO_MT_D3D"); + /* Some host drivers (MacOS, Mesa radeonsi) never unmap memory even when + * requested. When using the chunk allocator, running the tests with more + * than one thread can exceed the 32-bit virtual address space. */ + if (sizeof(void *) == 4 && !strcmp(winetest_platform, "wine")) + use_mt = FALSE; argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) -- 2.30.2
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=107234 Your paranoid android. === debian11 (32 bit report) === dxgi: dxgi.c:3354: Test failed: Got monitor rect (0,0)-(1280,800), expected (0,0)-(1024,768). dxgi.c:3356: Test failed: Got monitor rect (0,0)-(1280,800), expected (0,0)-(1024,768). dxgi.c:3369: Test failed: Got monitor rect (0,0)-(1280,800), expected (0,0)-(1024,768). dxgi.c:7144: Test failed: Got a different mode. === debian11 (32 bit Arabic:Morocco report) === dxgi: dxgi.c:3699: Test failed: Got monitor rect (0,0)-(800,600), expected (0,0)-(1280,800). dxgi.c:3644: Test failed: Got monitor rect (0,0)-(800,600), expected (0,0)-(1280,800). dxgi.c:3670: Test failed: Got monitor rect (0,0)-(800,600), expected (0,0)-(1280,800). dxgi.c:3699: Test failed: Got monitor rect (0,0)-(800,600), expected (0,0)-(1280,800). dxgi.c:3644: Test failed: Got monitor rect (0,0)-(800,600), expected (0,0)-(1280,800). dxgi.c:3670: Test failed: Got monitor rect (0,0)-(800,600), expected (0,0)-(1280,800). dxgi.c:3699: Test failed: Got monitor rect (0,0)-(800,600), expected (0,0)-(1280,800). === debian11 (32 bit French report) === dxgi: dxgi.c:3354: Test failed: Got monitor rect (0,0)-(848,480), expected (0,0)-(800,600). dxgi.c:3356: Test failed: Got monitor rect (0,0)-(848,480), expected (0,0)-(800,600). dxgi.c:3369: Test failed: Got monitor rect (0,0)-(848,480), expected (0,0)-(800,600). === debian11 (32 bit Hindi:India report) === dxgi: dxgi.c:3699: Test failed: Got monitor rect (0,0)-(640,480), expected (0,0)-(848,480). dxgi.c:3644: Test failed: Got monitor rect (0,0)-(640,480), expected (0,0)-(848,480). dxgi.c:3670: Test failed: Got monitor rect (0,0)-(640,480), expected (0,0)-(848,480). dxgi.c:3699: Test failed: Got monitor rect (0,0)-(640,480), expected (0,0)-(848,480). dxgi.c:3354: Test failed: Got monitor rect (0,0)-(1024,768), expected (0,0)-(640,480). dxgi.c:3356: Test failed: Got monitor rect (0,0)-(1024,768), expected (0,0)-(640,480). dxgi.c:3369: Test failed: Got monitor rect (0,0)-(1024,768), expected (0,0)-(640,480). dxgi.c:3354: Test failed: Got monitor rect (0,0)-(1280,854), expected (0,0)-(1024,768). dxgi.c:3356: Test failed: Got monitor rect (0,0)-(1280,854), expected (0,0)-(1024,768). dxgi.c:3369: Test failed: Got monitor rect (0,0)-(1280,854), expected (0,0)-(1024,768). === debian11 (32 bit Japanese:Japan report) === dxgi: dxgi.c:3354: Test failed: Got monitor rect (0,0)-(1280,800), expected (0,0)-(1280,854). dxgi.c:3356: Test failed: Got monitor rect (0,0)-(1280,800), expected (0,0)-(1280,854). dxgi.c:3369: Test failed: Got monitor rect (0,0)-(1280,800), expected (0,0)-(1280,854). === debian11 (32 bit Chinese:China report) === dxgi: dxgi.c:3354: Test failed: Got monitor rect (0,0)-(800,600), expected (0,0)-(1280,800). dxgi.c:3356: Test failed: Got monitor rect (0,0)-(800,600), expected (0,0)-(1280,800). dxgi.c:3369: Test failed: Got monitor rect (0,0)-(800,600), expected (0,0)-(1280,800).
participants (2)
-
Henri Verbeet -
Marvin