[PATCH 3/5] ddraw/tests: Accept broken testbot result for test_clear_rect_count().

Matteo Bruni mbruni at codeweavers.com
Mon May 4 16:16:13 CDT 2015


---
 dlls/ddraw/tests/ddraw1.c | 3 ++-
 dlls/ddraw/tests/ddraw2.c | 3 ++-
 dlls/ddraw/tests/ddraw4.c | 3 ++-
 dlls/ddraw/tests/ddraw7.c | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index da550b5..39e1570 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -3212,7 +3212,8 @@ static void test_clear_rect_count(void)
     ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr);
 
     color = get_surface_color(rt, 320, 240);
-    ok(compare_color(color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", color);
+    ok(compare_color(color, 0x00ffffff, 1) || broken(compare_color(color, 0x000000ff, 1)),
+            "Got unexpected color 0x%08x.\n", color);
 
     IDirectDrawSurface_Release(rt);
     destroy_viewport(device, viewport);
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index ce31cd6..8e543ab 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -3457,7 +3457,8 @@ static void test_clear_rect_count(void)
     ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr);
 
     color = get_surface_color(rt, 320, 240);
-    ok(compare_color(color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", color);
+    ok(compare_color(color, 0x00ffffff, 1) || broken(compare_color(color, 0x000000ff, 1)),
+            "Got unexpected color 0x%08x.\n", color);
 
     IDirectDrawSurface_Release(rt);
     destroy_viewport(device, viewport);
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index d3c9a34..f8e6e21 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -4321,7 +4321,8 @@ static void test_clear_rect_count(void)
     ok(SUCCEEDED(hr), "Failed to clear the viewport, hr %#x.\n", hr);
 
     color = get_surface_color(rt, 320, 240);
-    ok(compare_color(color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", color);
+    ok(compare_color(color, 0x00ffffff, 1) || broken(compare_color(color, 0x000000ff, 1)),
+            "Got unexpected color 0x%08x.\n", color);
 
     IDirect3DViewport3_Release(viewport);
     IDirectDrawSurface4_Release(rt);
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index b8691b8..573be3b 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -3942,7 +3942,7 @@ static void test_clear_rect_count(void)
     ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr);
 
     color = get_surface_color(rt, 320, 240);
-    ok(compare_color(color, 0x00ffffff, 1),
+    ok(compare_color(color, 0x00ffffff, 1) || broken(compare_color(color, 0x00ff0000, 1)),
             "Clear with count = 0, rect != NULL has color %#08x.\n", color);
 
     hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ffffff, 1.0f, 0);
-- 
2.3.6




More information about the wine-patches mailing list