[PATCH v2 0/3] MR1824: Remove broken from some color tests that can also fail on Linux.
They fail on the Gitlab CI. An alternative would be to mark them todo_wine but it's not clear that there's anything we want to do here. -- v2: d3d9/tests: Mark some of the depth bias tests as todo. d3d9/tests: Mark a zero-size pixel test as todo. d3d8/tests: Mark a zero-size pixel test as todo. https://gitlab.winehq.org/wine/wine/-/merge_requests/1824
From: Alexandre Julliard <julliard(a)winehq.org> It fails on the Gitlab CI. --- dlls/d3d8/tests/visual.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 434474b292d..ea2d96378f7 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -7833,6 +7833,7 @@ static void test_pointsize(void) * it does the "useful" thing on all the drivers I tried. */ /* On WARP it does draw some pixels, most of the time. */ color = getPixelColor(device, 64, 64); + todo_wine_if(!color_match(color, 0x0000ffff, 0)) ok(color_match(color, 0x0000ffff, 0) || broken(color_match(color, 0x00ff0000, 0)) || broken(color_match(color, 0x00ffff00, 0)) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1824
From: Alexandre Julliard <julliard(a)winehq.org> It fails on the Gitlab CI. --- dlls/d3d9/tests/visual.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d1bcaf39c14..f630a074ea0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12220,6 +12220,7 @@ static void test_pointsize(void) * it does the "useful" thing on all the drivers I tried. */ /* On WARP it does draw some pixels, most of the time. */ color = getPixelColor(device, 64, 64); + todo_wine_if(!color_match(color, 0x0000ffff, 0)) ok(color_match(color, 0x0000ffff, 0) || broken(color_match(color, 0x00ff0000, 0)) || broken(color_match(color, 0x00ffff00, 0)) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1824
From: Alexandre Julliard <julliard(a)winehq.org> They fail on the Gitlab CI. --- dlls/d3d9/tests/visual.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f630a074ea0..ccfa8ce5e3a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -22485,23 +22485,29 @@ static void test_depthbias(void) /* The broken results are for the WARP driver on the testbot. It seems to initialize * a scaling factor based on the first depth format that is used. Other formats with * a different depth size then render incorrectly. */ + todo_wine_if(!color_match(color, 0x000000ff, 1)) ok(color_match(color, 0x000000ff, 1) || broken(color_match(color, 0x00ffffff, 1)), "Got unexpected color %08x at x=64, format %u.\n", color, formats[i]); color = getPixelColor(device, 190, 240); + todo_wine_if(!color_match(color, 0x000000ff, 1)) ok(color_match(color, 0x000000ff, 1) || broken(color_match(color, 0x00ffffff, 1)), "Got unexpected color %08x at x=190, format %u.\n", color, formats[i]); color = getPixelColor(device, 194, 240); + todo_wine_if(!color_match(color, 0x0000ff00, 1)) ok(color_match(color, 0x0000ff00, 1) || broken(color_match(color, 0x00ffffff, 1)), "Got unexpected color %08x at x=194, format %u.\n", color, formats[i]); color = getPixelColor(device, 318, 240); + todo_wine_if(!color_match(color, 0x0000ff00, 1)) ok(color_match(color, 0x0000ff00, 1) || broken(color_match(color, 0x00ffffff, 1)), "Got unexpected color %08x at x=318, format %u.\n", color, formats[i]); color = getPixelColor(device, 322, 240); + todo_wine_if(!color_match(color, 0x00ff0000, 1)) ok(color_match(color, 0x00ff0000, 1) || broken(color_match(color, 0x00000000, 1)), "Got unexpected color %08x at x=322, format %u.\n", color, formats[i]); color = getPixelColor(device, 446, 240); + todo_wine_if(!color_match(color, 0x00ff0000, 1)) ok(color_match(color, 0x00ff0000, 1) || broken(color_match(color, 0x00000000, 1)), "Got unexpected color %08x at x=446, format %u.\n", color, formats[i]); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1824
This merge request was approved by Zebediah Figura. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1824
participants (3)
-
Alexandre Julliard -
Alexandre Julliard (@julliard) -
Zebediah Figura (@zfigura)