Fabian Maurer : evr/tests: Run the tests with todo_wine instead of skipping them.

Alexandre Julliard julliard at winehq.org
Mon Sep 25 16:34:31 CDT 2017


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

Author: Fabian Maurer <dark.shadow4 at web.de>
Date:   Sat Sep 23 17:21:16 2017 +0200

evr/tests: Run the tests with todo_wine instead of skipping them.

Signed-off-by: Fabian Maurer <dark.shadow4 at web.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/evr/tests/Makefile.in |  2 +-
 dlls/evr/tests/filter.c    | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/dlls/evr/tests/Makefile.in b/dlls/evr/tests/Makefile.in
index c370646..5ee4f84 100644
--- a/dlls/evr/tests/Makefile.in
+++ b/dlls/evr/tests/Makefile.in
@@ -1,5 +1,5 @@
 TESTDLL   = evr.dll
-IMPORTS   = mfuuid strmiids strmbase uuid ole32 oleaut32
+IMPORTS   = mfuuid strmiids uuid ole32 oleaut32
 
 C_SRCS = \
 	filter.c
diff --git a/dlls/evr/tests/filter.c b/dlls/evr/tests/filter.c
index 4f82b14..3bae738 100644
--- a/dlls/evr/tests/filter.c
+++ b/dlls/evr/tests/filter.c
@@ -83,8 +83,8 @@ static void test_aggregation(const CLSID clsid_inner, const IID iid_inner, const
 
     /* aggregation, request IUnknown */
     hr = CoCreateInstance(&clsid_inner, unk_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (LPVOID*)&unk_inner);
-    ok(hr == S_OK, "%s: run %d: Third CoCreateInstance returned %x\n", testid, testrun, hr);
-    ok(unk_inner != NULL, "%s: run %d: unk_inner is NULL\n", testid, testrun);
+    todo_wine ok(hr == S_OK, "%s: run %d: Third CoCreateInstance returned %x\n", testid, testrun, hr);
+    todo_wine ok(unk_inner != NULL, "%s: run %d: unk_inner is NULL\n", testid, testrun);
 
     if (!unk_inner)
     {
@@ -163,12 +163,6 @@ static void test_evr_filter_aggregations(void)
     };
     int i;
 
-    if(!strcmp(winetest_platform, "wine"))
-    {
-        skip("Not supported yet.\n");
-        return;
-    }
-
     for (i = 0; i < sizeof(iids) / sizeof(iids[0]); i++)
     {
         test_aggregation(CLSID_EnhancedVideoRenderer, *iids[i], "filter", i);




More information about the wine-cvs mailing list