Bug 992238 - Disable test_init_destroy_multiple_contexts_and_streams on Windows 7. r=padenot, a=test-only
authorMatthew Gregan <kinetik@flim.org>
Tue, 05 Aug 2014 21:57:00 -0400
changeset 208268 980f2d449ccb
parent 208265 599c7756380c
child 208269 04f540c59457
push id3796
push userryanvm@gmail.com
push date2014-08-08 18:52 +0000
treeherdermozilla-beta@1cf7b5810eb5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspadenot, test-only
bugs992238
milestone32.0
Bug 992238 - Disable test_init_destroy_multiple_contexts_and_streams on Windows 7. r=padenot, a=test-only
media/libcubeb/tests/test_sanity.cpp
--- a/media/libcubeb/tests/test_sanity.cpp
+++ b/media/libcubeb/tests/test_sanity.cpp
@@ -510,26 +510,27 @@ int is_windows_7()
 
 int
 main(int argc, char * argv[])
 {
   test_init_destroy_context();
   test_init_destroy_multiple_contexts();
   test_init_destroy_stream();
   test_init_destroy_multiple_streams();
-  test_init_destroy_multiple_contexts_and_streams();
   test_basic_stream_operations();
   test_stream_position();
 
   /* Sometimes, when using WASAPI on windows 7 (vista and 8 are okay), and
    * calling Activate a lot on an AudioClient, 0x800700b7 is returned. This is
    * the HRESULT value for "Cannot create a file when that file already exists",
    * and is not documented as a possible return value for this call. Hence, we
    * try to limit the number of streams we create in this test. */
   if (!is_windows_7()) {
+    test_init_destroy_multiple_contexts_and_streams();
+
     delay_callback = 0;
     test_init_start_stop_destroy_multiple_streams(0, 0);
     test_init_start_stop_destroy_multiple_streams(1, 0);
     test_init_start_stop_destroy_multiple_streams(0, 150);
     test_init_start_stop_destroy_multiple_streams(1, 150);
     delay_callback = 1;
     test_init_start_stop_destroy_multiple_streams(0, 0);
     test_init_start_stop_destroy_multiple_streams(1, 0);