[ros-diffs] [spetreolle] 59392: [QUARTZ] Use winetest_interactive to disable tests.

Author: spetreolle
Date: Sun Jun 30 13:59:59 2013
New Revision: 59392

URL: http://svn.reactos.org/svn/reactos?rev=59392&view=rev
Log:
[QUARTZ]
Use winetest_interactive to disable tests.

Modified:
    trunk/rostests/winetests/quartz/dsoundrender.c
    trunk/rostests/winetests/quartz/filtergraph.c
    trunk/rostests/winetests/quartz/misc.c
    trunk/rostests/winetests/quartz/testlist.c
    trunk/rostests/winetests/quartz/videorenderer.c

Modified: trunk/rostests/winetests/quartz/dsoundrender.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/dsoundre…
==============================================================================
--- trunk/rostests/winetests/quartz/dsoundrender.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/quartz/dsoundrender.c	[iso-8859-1] Sun Jun 30 13:59:59 2013
@@ -221,6 +221,11 @@
 
 START_TEST(dsoundrender)
 {
+if(!winetest_interactive)
+{
+    skip("Skipping dsoundrender test, see ROSTESTS_116\n");
+    return;
+}
     CoInitialize(NULL);
     if (!create_dsound_renderer())
         return;

Modified: trunk/rostests/winetests/quartz/filtergraph.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filtergr…
==============================================================================
--- trunk/rostests/winetests/quartz/filtergraph.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/quartz/filtergraph.c	[iso-8859-1] Sun Jun 30 13:59:59 2013
@@ -1846,6 +1846,12 @@
 START_TEST(filtergraph)
 {
     CoInitializeEx(NULL, COINIT_MULTITHREADED);
+if(!winetest_interactive)
+{
+    skip("Skipping filtergraph test, see ROSTESTS_116\n");
+    return;
+}
+else{
     test_render_run(avifileA);
     test_render_run(mpegfileA);
     test_graph_builder();
@@ -1853,5 +1859,6 @@
     test_mediacontrol();
     test_filter_graph2();
     test_render_filter_priority();
+}
     CoUninitialize();
 }

Modified: trunk/rostests/winetests/quartz/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/misc.c?r…
==============================================================================
--- trunk/rostests/winetests/quartz/misc.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/quartz/misc.c	[iso-8859-1] Sun Jun 30 13:59:59 2013
@@ -206,9 +206,15 @@
 {
     CoInitialize(NULL);
 
+if(!winetest_interactive)
+{
+    skip("Skipping misc test, see ROSTESTS_116\n");
+    return;
+}
+else{
     test_video_renderer_aggregations();
     test_filter_graph_aggregations();
     test_filter_mapper_aggregations();
-
+}
     CoUninitialize();
 }

Modified: trunk/rostests/winetests/quartz/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/testlist…
==============================================================================
--- trunk/rostests/winetests/quartz/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/quartz/testlist.c	[iso-8859-1] Sun Jun 30 13:59:59 2013
@@ -18,16 +18,12 @@
 const struct test winetest_testlist[] =
 {
     { "avisplitter", func_avisplitter },
-#ifdef ROSTESTS_116_FIXED
     { "dsoundrender", func_dsoundrender },
     { "filtergraph", func_filtergraph },
-#endif /* ROSTESTS_116_FIXED */
     { "filtermapper", func_filtermapper },
     { "memallocator", func_memallocator },
-#ifdef ROSTESTS_116_FIXED
     { "misc", func_misc },
     { "videorenderer", func_videorenderer },
-#endif /* ROSTESTS_116_FIXED */
     { "referenceclock", func_referenceclock },
     { 0, 0 }
 };

Modified: trunk/rostests/winetests/quartz/videorenderer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/videoren…
==============================================================================
--- trunk/rostests/winetests/quartz/videorenderer.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/quartz/videorenderer.c	[iso-8859-1] Sun Jun 30 13:59:59 2013
@@ -156,9 +156,15 @@
     if (!create_video_renderer())
         return;
 
+if(!winetest_interactive)
+{
+    skip("Skipping filtergraph test, see ROSTESTS_116\n");
+    return;
+}
+else{
     test_query_interface();
     test_basefilter();
-
+}
     release_video_renderer();
 
     CoUninitialize();