[PATCH 0/1] MR2845: gdi32/tests: Use skip() for APIs which are stubs in some drivers.
--- It turns out D3DKMTCheckVidPnExclusiveOwnership() and D3DKMTSetVidPnSourceOwner() are just stubs in some drivers (nulldrv), causing the tests to be skipped. Ideally we'd fail if the API is missing and skip otherwise but it's probably overkill. So go back to a simple skip() with a comment. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2845
From: Francois Gouget <fgouget(a)codeweavers.com> --- It turns out D3DKMTCheckVidPnExclusiveOwnership() and D3DKMTSetVidPnSourceOwner() are just stubs in some drivers (nulldrv), causing the tests to be skipped. Ideally we'd fail if the API is missing and skip otherwise but it's probably overkill. So go back to a simple skip() with a comment. --- dlls/gdi32/tests/driver.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 162208c26ca..0c976a87c62 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -399,7 +399,8 @@ static void test_D3DKMTCheckVidPnExclusiveOwnership(void) if (!pD3DKMTCheckVidPnExclusiveOwnership || pD3DKMTCheckVidPnExclusiveOwnership(NULL) == STATUS_PROCEDURE_NOT_FOUND) { - win_skip("D3DKMTCheckVidPnExclusiveOwnership() is unavailable.\n"); + /* This is a stub in some drivers (e.g. nulldrv) */ + skip("D3DKMTCheckVidPnExclusiveOwnership() is unavailable.\n"); return; } @@ -623,7 +624,8 @@ static void test_D3DKMTSetVidPnSourceOwner(void) if (!pD3DKMTSetVidPnSourceOwner || pD3DKMTSetVidPnSourceOwner(&set_owner_desc) == STATUS_PROCEDURE_NOT_FOUND) { - win_skip("D3DKMTSetVidPnSourceOwner() is unavailable.\n"); + /* This is a stub in some drivers (e.g. nulldrv) */ + skip("D3DKMTSetVidPnSourceOwner() is unavailable.\n"); return; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2845
This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2845
participants (3)
-
Francois Gouget -
Francois Gouget (@fgouget) -
Huw Davies (@huw)