[PATCH 0/1] MR8238: d2d1/tests: Skip tests when device creation fails.
[Test pattern page](https://test.winehq.org/data/patterns.html#d2d1:d2d1). This gets this `create_device` in function `test_no_target` in line with how it is handled in `init_test_context_`. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8238
From: Bernhard Übelacker <bernhardu(a)mailbox.org> --- dlls/d2d1/tests/d2d1.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 2b894695c98..3617e7b0063 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -15738,8 +15738,11 @@ static void test_no_target(BOOL d3d11) return; } - dxgi_device = create_device(d3d11); - ok(!!dxgi_device, "Failed to create device.\n"); + if (!(dxgi_device = create_device(d3d11))) + { + skip("Failed to create device, skipping tests.\n"); + return; + } hr = pD2D1CreateDevice(dxgi_device, NULL, &device); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8238
Nikolay Sivov (@nsivov) commented about dlls/d2d1/tests/d2d1.c:
return; }
- dxgi_device = create_device(d3d11); - ok(!!dxgi_device, "Failed to create device.\n"); + if (!(dxgi_device = create_device(d3d11))) + { + skip("Failed to create device, skipping tests.\n"); + return; + }
This works of course, but we might as well use the same init_test_context() and only use ctx.device from it. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8238#note_105775
participants (2)
-
Bernhard Übelacker -
Nikolay Sivov (@nsivov)