[AMSTREAM_WINETEST][QUARTZ_WINETEST]

- Enable skipped tests
ROSTESTS-116 #resolve
ROSTESTS-123

svn path=/trunk/; revision=63758

diff --git a/rostests/winetests/amstream/amstream.c b/rostests/winetests/amstream/amstream.c
index bd7b469..7fbddc8 100644 (file)
--- a/rostests/winetests/amstream/amstream.c
+++ b/rostests/winetests/amstream/amstream.c
@@ -440,14 +440,7 @@ START_TEST(amstream)
 
     CoInitializeEx(NULL, COINIT_MULTITHREADED);
 
-    if (!winetest_interactive)
-    {
-        win_skip("test_media_streams(), ROSTESTS-123\n");
-    }
-    else
-    {
-        test_media_streams();
-    }
+    test_media_streams();
  
     file = CreateFileW(filenameW, 0, 0, NULL, OPEN_EXISTING, 0, NULL);
     if (file != INVALID_HANDLE_VALUE)

diff --git a/rostests/winetests/quartz/dsoundrender.c b/rostests/winetests/quartz/dsoundrender.c
index 3a8f8da..c613423 100644 (file)
--- a/rostests/winetests/quartz/dsoundrender.c
+++ b/rostests/winetests/quartz/dsoundrender.c
@@ -221,11 +221,6 @@ static void test_basefilter(void)
 
 START_TEST(dsoundrender)
 {
-    if (!winetest_interactive)
-    {
-        skip("Skipping dsoundrender test, see ROSTESTS-116\n");
-        return;
-    }
     CoInitialize(NULL);
     if (!create_dsound_renderer())
         return;

diff --git a/rostests/winetests/quartz/filtergraph.c b/rostests/winetests/quartz/filtergraph.c
index 166472d..36ec354 100644 (file)
--- a/rostests/winetests/quartz/filtergraph.c
+++ b/rostests/winetests/quartz/filtergraph.c
@@ -1878,12 +1878,6 @@ START_TEST(filtergraph)
 {
     HRESULT hr;
 
-    if (!winetest_interactive)
-    {
-        skip("Skipping filtergraph test, see ROSTESTS-116\n");
-        return;
-    }
-
     CoInitializeEx(NULL, COINIT_MULTITHREADED);
     hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER,
                           &IID_IGraphBuilder, (LPVOID*)&pgraph);

diff --git a/rostests/winetests/quartz/misc.c b/rostests/winetests/quartz/misc.c
index 743d23b..748c0f2 100644 (file)
--- a/rostests/winetests/quartz/misc.c
+++ b/rostests/winetests/quartz/misc.c
@@ -224,17 +224,10 @@ START_TEST(misc)
 {
     CoInitialize(NULL);
 
-    if (!winetest_interactive)
-    {
-        skip("Skipping misc test, see ROSTESTS-116\n");
-        return;
-    }
-    else
-    {
-        test_null_renderer_aggregations();
-        test_video_renderer_aggregations();
-        test_filter_graph_aggregations();
-        test_filter_mapper_aggregations();
-    }
+    test_null_renderer_aggregations();
+    test_video_renderer_aggregations();
+    test_filter_graph_aggregations();
+    test_filter_mapper_aggregations();
+
     CoUninitialize();
 }

diff --git a/rostests/winetests/quartz/videorenderer.c b/rostests/winetests/quartz/videorenderer.c
index d826ce9..35e6f10 100644 (file)
--- a/rostests/winetests/quartz/videorenderer.c
+++ b/rostests/winetests/quartz/videorenderer.c
@@ -156,16 +156,9 @@ START_TEST(videorenderer)
     if (!create_video_renderer())
         return;
 
-    if (!winetest_interactive)
-    {
-        skip("Skipping filtergraph test, see ROSTESTS-116\n");
-        return;
-    }
-    else
-    {
-        test_query_interface();
-        test_basefilter();
-    }
+    test_query_interface();
+    test_basefilter();
+
     release_video_renderer();
 
     CoUninitialize();