Signed-off-by: Zebediah Figura zfigura@codeweavers.com --- dlls/d2d1/tests/d2d1.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index be97c7f4c6a..a2abf3629da 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -161,9 +161,10 @@ static void run_queued_tests(void) SYSTEM_INFO si; LONG test_idx;
- /* Running the tests multithreaded on 32-bit maps too much memory in Wine, - * even with only 2 threads. */ - if (!use_mt || sizeof(void *) == 4) + /* 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 (!use_mt || (sizeof(void *) == 4 && !strcmp(winetest_platform, "wine"))) { for (i = 0; i < mt_test_count; ++i) {
Signed-off-by: Zebediah Figura zfigura@codeweavers.com --- dlls/d3d10core/tests/d3d10core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 3780cf3f9fb..01c9f4ffefc 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -129,7 +129,10 @@ static void run_queued_tests(void) SYSTEM_INFO si; LONG test_idx;
- if (!use_mt) + /* 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 (!use_mt || (sizeof(void *) == 4 && !strcmp(winetest_platform, "wine"))) { for (i = 0; i < mt_test_count; ++i) {
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=107035
Your paranoid android.
=== build (build log) ===
error: patch failed: dlls/d2d1/tests/d2d1.c:161 Task: Patch failed to apply
=== debian11 (build log) ===
error: patch failed: dlls/d2d1/tests/d2d1.c:161 Task: Patch failed to apply
=== debian11 (build log) ===
error: patch failed: dlls/d2d1/tests/d2d1.c:161 Task: Patch failed to apply
Signed-off-by: Zebediah Figura zfigura@codeweavers.com --- dlls/d3d11/tests/d3d11.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4ee7155f7c4..7494d430ad7 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -201,7 +201,10 @@ static void run_queued_tests(void) SYSTEM_INFO si; LONG test_idx;
- if (!use_mt) + /* 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 (!use_mt || (sizeof(void *) == 4 && !strcmp(winetest_platform, "wine"))) { for (i = 0; i < mt_test_count; ++i) {
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=107036
Your paranoid android.
=== build (build log) ===
error: patch failed: dlls/d2d1/tests/d2d1.c:161 Task: Patch failed to apply
=== debian11 (build log) ===
error: patch failed: dlls/d2d1/tests/d2d1.c:161 Task: Patch failed to apply
=== debian11 (build log) ===
error: patch failed: dlls/d2d1/tests/d2d1.c:161 Task: Patch failed to apply
Signed-off-by: Zebediah Figura zfigura@codeweavers.com --- dlls/dxgi/tests/dxgi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index a83964d7523..948c6f4e33b 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -93,7 +93,10 @@ static void run_queued_tests(void) SYSTEM_INFO si; LONG test_idx;
- if (!use_mt) + /* 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 (!use_mt || (sizeof(void *) == 4 && !strcmp(winetest_platform, "wine"))) { for (i = 0; i < mt_test_count; ++i) {
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=107037
Your paranoid android.
=== build (build log) ===
error: patch failed: dlls/d2d1/tests/d2d1.c:161 Task: Patch failed to apply
=== debian11 (build log) ===
error: patch failed: dlls/d2d1/tests/d2d1.c:161 Task: Patch failed to apply
=== debian11 (build log) ===
error: patch failed: dlls/d2d1/tests/d2d1.c:161 Task: Patch failed to apply
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=107029
Your paranoid android.
=== build (build log) ===
error: patch failed: dlls/d2d1/tests/d2d1.c:161 Task: Patch failed to apply
=== debian11 (build log) ===
error: patch failed: dlls/d2d1/tests/d2d1.c:161 Task: Patch failed to apply
=== debian11 (build log) ===
error: patch failed: dlls/d2d1/tests/d2d1.c:161 Task: Patch failed to apply
-
Marvin -
Zebediah Figura