Jactry Zeng : quartz/tests: Skip test_render_run() if test file doesn' t exist.

Alexandre Julliard julliard at winehq.org
Wed Jan 4 15:15:15 CST 2017


Module: wine
Branch: master
Commit: adabe844b212acaa5c969e84efb1ff8b943d1ad5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=adabe844b212acaa5c969e84efb1ff8b943d1ad5

Author: Jactry Zeng <jzeng at codeweavers.com>
Date:   Wed Jan  4 22:15:58 2017 +0800

quartz/tests: Skip test_render_run() if test file doesn't exist.

Signed-off-by: Jactry Zeng <jzeng at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/quartz/tests/filtergraph.c | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index 9db1c72..e5671d2 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -354,25 +354,26 @@ static void test_render_run(const WCHAR *file)
     HANDLE h;
     HRESULT hr;
 
+    h = CreateFileW(file, 0, 0, NULL, OPEN_EXISTING, 0, NULL);
+    if (h == INVALID_HANDLE_VALUE) {
+        skip("Could not read test file %s, skipping test\n", wine_dbgstr_w(file));
+        return;
+    }
+    CloseHandle(h);
+
     if (!createfiltergraph())
         return;
 
-    h = CreateFileW(file, 0, 0, NULL, OPEN_EXISTING, 0, NULL);
-    if (h != INVALID_HANDLE_VALUE) {
-        CloseHandle(h);
-        hr = IGraphBuilder_RenderFile(pgraph, file, NULL);
-        ok(hr==S_OK, "RenderFile returned: %x\n", hr);
-        rungraph();
-    }
+    hr = IGraphBuilder_RenderFile(pgraph, file, NULL);
+    ok(hr == S_OK, "RenderFile returned: %x\n", hr);
+    rungraph();
 
     releasefiltergraph();
 
-    if (h != INVALID_HANDLE_VALUE) {
-        /* check reference leaks */
-        h = CreateFileW(file, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);
-        ok(h != INVALID_HANDLE_VALUE, "CreateFile failed: err=%d\n", GetLastError());
-        CloseHandle(h);
-    }
+    /* check reference leaks */
+    h = CreateFileW(file, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);
+    ok(h != INVALID_HANDLE_VALUE, "CreateFile failed: err=%d\n", GetLastError());
+    CloseHandle(h);
 }
 
 static void test_graph_builder(void)




More information about the wine-cvs mailing list