From cea117cf74b7457fd36eb4e5e9a2a5ecd59973cf Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Tue, 29 Jul 2014 07:56:08 +0000 Subject: [PATCH] [AMSTREAM_WINETEST][QUARTZ_WINETEST] - Enable skipped tests ROSTESTS-116 #resolve ROSTESTS-123 svn path=/trunk/; revision=63758 --- rostests/winetests/amstream/amstream.c | 9 +-------- rostests/winetests/quartz/dsoundrender.c | 5 ----- rostests/winetests/quartz/filtergraph.c | 6 ------ rostests/winetests/quartz/misc.c | 17 +++++------------ rostests/winetests/quartz/videorenderer.c | 13 +++---------- 5 files changed, 9 insertions(+), 41 deletions(-) diff --git a/rostests/winetests/amstream/amstream.c b/rostests/winetests/amstream/amstream.c index bd7b469bdde..7fbddc8270b 100644 --- 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 3a8f8da343c..c6134234444 100644 --- 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 166472d2a7f..36ec354a5c6 100644 --- 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 743d23bede1..748c0f2cfd3 100644 --- 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 d826ce93bea..35e6f10185d 100644 --- 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();