Stefan Dösinger : d3drm/tests: Do not depend on a todo_wine result more than necessary.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 79ea8056b6c04b690e5e853a1600e12da8c114a1
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=79ea8056b6c04b690e5e853a1...

Author: Stefan Dösinger <stefan(a)codeweavers.com>
Date:   Wed Nov 10 14:56:08 2021 +0300

d3drm/tests: Do not depend on a todo_wine result more than necessary.

This addresses a failure on the cw-gtx560 testbot machine reported by
Francois.

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/d3drm/tests/d3drm.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
index f1d48639c14..51d10d797bc 100644
--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
@@ -7286,13 +7286,23 @@ static void test_viewport_clear2(void)
     ret_color = get_surface_color(surface, 500, 400);
     todo_wine ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
 
+    /* Remove old draw contents */
+    hr = IDirect3DRMFrame3_SetSceneBackgroundRGB(frame3, 0.0f, 1.0f, 0.0f);
+    ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+    hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
+    todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
+    hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL);
+    ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
+    hr = IDirect3DRMFrame3_SetSceneBackgroundRGB(frame3, 1.0f, 1.0f, 1.0f);
+    ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr);
+
     /* Clear with no flags */
     hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
     todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);
     hr = IDirect3DRMViewport2_Clear(viewport2, 0);
     ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr);
     ret_color = get_surface_color(surface, 320, 240);
-    todo_wine ok(compare_color(ret_color, 0x00bada55, 1), "Got unexpected color 0x%08x.\n", ret_color);
+    ok(compare_color(ret_color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", ret_color);
 
     hr = IDirect3DRMViewport2_Configure(viewport2, 0, 0, rc.right, rc.bottom);
     todo_wine ok(SUCCEEDED(hr), "Cannot configure viewport (hr = %#x).\n", hr);