Bug 1310297 - Remove test annotations using b2g, mulet or gonk: dom/media. r=RyanVM
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 05 Nov 2016 11:29:16 +0100
changeset 321158 3b3a7ce28a424579fe868c44ab947984c5966768
parent 321157 0c132727ac31419a77a7d3146da95a7c079513a1
child 321159 66c24d153af8b1430d17be8ed2a3b41759a2661e
push id30919
push userphilringnalda@gmail.com
push dateSat, 05 Nov 2016 20:28:20 +0000
treeherdermozilla-central@572249b2ffb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersRyanVM
bugs1310297
milestone52.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1310297 - Remove test annotations using b2g, mulet or gonk: dom/media. r=RyanVM MozReview-Commit-ID: JVsnpnBDeCC
dom/media/mediasource/test/mochitest.ini
dom/media/test/crashtests/crashtests.list
dom/media/test/mochitest.ini
dom/media/test/test_mediarecorder_mp4_support.html
dom/media/tests/mochitest/identity/mochitest.ini
dom/media/tests/mochitest/mochitest.ini
dom/media/webaudio/test/blink/mochitest.ini
dom/media/webaudio/test/mochitest.ini
dom/media/webspeech/recognition/test/mochitest.ini
--- a/dom/media/mediasource/test/mochitest.ini
+++ b/dom/media/mediasource/test/mochitest.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' # b2g( ReferenceError: MediaSource is not defined)
 subsuite = media
 support-files =
   mediasource.js
   seek.webm seek.webm^headers^
   seek_lowres.webm seek_lowres.webm^headers^
   bipbop/bipbop2s.mp4 bipbop/bipbop2s.mp4^headers^
   bipbop/bipbopinit.mp4 bipbop/bipbop_audioinit.mp4 bipbop/bipbop_videoinit.mp4
   bipbop/bipbop1.m4s bipbop/bipbop_audio1.m4s bipbop/bipbop_video1.m4s
@@ -58,17 +57,17 @@ skip-if = ((os == "win" && os_version ==
 [test_DrainOnMissingData_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_DurationChange.html]
 [test_DurationUpdated.html]
 [test_DurationUpdated_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_EndOfStream.html]
 [test_EndOfStream_mp4.html]
-skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android' || buildapp == 'mulet')) # Not supported on xp and android 2.3
+skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_Eviction_mp4.html]
 skip-if = (os == "win" && os_version == "5.1") # Not supported on xp.
 [test_FrameSelection.html]
 [test_FrameSelection_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_HaveMetadataUnbufferedSeek.html]
 [test_HaveMetadataUnbufferedSeek_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
@@ -123,16 +122,16 @@ skip-if = ((os == "win" && os_version ==
 [test_Threshold_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_TimestampOffset_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_TruncatedDuration.html]
 [test_TruncatedDuration_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_WaitingOnMissingData.html]
-skip-if = (toolkit == 'android' || buildapp == 'mulet') #timeout android/mulet only bug 1101187
+skip-if = (toolkit == 'android') #timeout android only bug 1101187
 [test_WaitingOnMissingData_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_WaitingOnMissingDataEnded_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_WaitingToEndedTransition_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 
--- a/dom/media/test/crashtests/crashtests.list
+++ b/dom/media/test/crashtests/crashtests.list
@@ -1,18 +1,18 @@
-skip-if(B2G) load 0-timescale.html # bug 1229166
+load 0-timescale.html # bug 1229166
 skip-if(Android) load 459439-1.html # bug 888557
 load 466607-1.html
 load 466945-1.html
 load 468763-1.html
 load 474744-1.html
 HTTP load 481136-1.html # needs to be HTTP to recognize the ogg as an audio file?
 load 492286-1.xhtml
 load 493915-1.html
-skip-if(B2G) load 495794-1.html # in b2g all the media are muted by default
+load 495794-1.html
 load 576612-1.html
 load 752784-1.html
 load 789075-1.html
 HTTP load 795892-1.html
 load 844563.html
 load 846612.html
 load 852838.html
 load 865537-1.html
@@ -66,24 +66,24 @@ load 944851.html
 load 952756.html
 load 966636.html
 load 986901.html
 load 990794.html
 load 995289.html
 load 1012609.html
 load 1015662.html
 load 1020205.html
-skip-if(Android||B2G) test-pref(media.navigator.permission.disabled,true) load 1028458.html # bug 1048863
+skip-if(Android) test-pref(media.navigator.permission.disabled,true) load 1028458.html # bug 1048863
 load 1041466.html
 load 1045650.html
 load 1080986.html
 load 1122218.html
 load 1127188.html
 load 1157994.html
-skip-if(!B2G) load 1158427.html
+load 1158427.html
 load 1185176.html
 load 1185192.html
 load 1223670.html
 load 1228484.html
 load 1304948.html
 load 1291702.html
 load disconnect-wrong-destination.html
 load analyser-channels-1.html
@@ -93,10 +93,10 @@ load buffer-source-ended-1.html
 load buffer-source-resampling-start-1.html
 load doppler-1.html
 HTTP load media-element-source-seek-1.html
 load offline-buffer-source-ended-1.html
 load oscillator-ended-1.html
 load oscillator-ended-2.html
 load video-replay-after-audio-end.html
 # This needs to run at the end to avoid leaking busted state into other tests.
-skip-if(B2G) load 691096-1.html # bug 852821
+load 691096-1.html
 load 1236639.html
--- a/dom/media/test/mochitest.ini
+++ b/dom/media/test/mochitest.ini
@@ -18,17 +18,17 @@
 # gErrorTests in manifest.js.
 
 # To test for a specific bug in handling a specific resource type, make the
 # test first check canPlayType for the type, and if it's not supported, just
 # do ok(true, "Type not supported") and stop the test.
 
 [DEFAULT]
 subsuite = media
-skip-if = buildapp == 'mulet' || android_version == '18'
+skip-if = android_version == '18' # Run on real devices via autophone
 support-files =
   16bit_wave_extrametadata.wav
   16bit_wave_extrametadata.wav^headers^
   320x240.ogv
   320x240.ogv^headers^
   448636.ogv
   448636.ogv^headers^
   A4.ogv
@@ -623,27 +623,25 @@ support-files =
   wavedata_u8.wav
   wavedata_u8.wav^headers^
   wavedata_ulaw.wav
   wavedata_ulaw.wav^headers^
   !/dom/canvas/test/captureStream_common.js
   !/dom/html/test/reflect.js
 
 [test_access_control.html]
-skip-if = buildapp == 'b2g' && toolkit != 'gonk' # bug 1082984
 [test_aspectratio_mp4.html]
 [test_audio1.html]
 [test_audio2.html]
 [test_audioDocumentTitle.html]
 skip-if = true # bug 475110 - disabled since we don't play Wave files standalone
 [test_autoplay.html]
 [test_autoplay_contentEditable.html]
 [test_buffered.html]
 [test_bug448534.html]
-skip-if = buildapp == 'mulet'
 [test_bug463162.xhtml]
 [test_bug465498.html]
 [test_bug495145.html]
 skip-if = (os == 'mac' && os_version == '10.6') # bug 1021174
 [test_bug495300.html]
 [test_bug654550.html]
 [test_bug686942.html]
 [test_bug726904.html]
@@ -660,63 +658,61 @@ tags=webvtt
 [test_bug1113600.html]
 tags=capturestream
 [test_bug1242338.html]
 [test_bug1242594.html]
 [test_bug1248229.html]
 tags=capturestream
 [test_can_play_type.html]
 [test_can_play_type_mpeg.html]
-skip-if = buildapp == 'b2g' # bug 1021675
 [test_can_play_type_no_ogg.html]
 [test_can_play_type_ogg.html]
 [test_chaining.html]
 [test_clone_media_element.html]
 [test_closing_connections.html]
 [test_constants.html]
 [test_controls.html]
 [test_cueless_webm_seek-1.html]
 [test_cueless_webm_seek-2.html]
 [test_cueless_webm_seek-3.html]
 [test_currentTime.html]
 [test_decode_error.html]
 [test_decoder_disable.html]
 [test_defaultMuted.html]
 [test_delay_load.html]
-skip-if = buildapp == 'b2g' && toolkit != 'gonk' # bug 1082984
 [test_eme_session_callable_value.html]
 [test_eme_canvas_blocked.html]
 skip-if = toolkit == 'android' # bug 1149374
 [test_eme_detach_media_keys.html]
 skip-if = toolkit == 'android' # bug 1149374
 [test_eme_initDataTypes.html]
 skip-if = toolkit == 'android' # bug 1149374
 [test_eme_missing_pssh.html]
 skip-if = toolkit == 'android' # bug 1149374
 [test_eme_non_mse_fails.html]
 skip-if = toolkit == 'android' # bug 1149374
 [test_eme_request_notifications.html]
 skip-if = toolkit == 'android' # bug 1149374
 [test_eme_playback.html]
-skip-if = toolkit == 'android' || toolkit == 'gonk' # android: bug 1149374; gonk: bug 1193351
+skip-if = toolkit == 'android' # bug 1149374
 [test_eme_requestKeySystemAccess.html]
 skip-if = toolkit == 'android' # bug 1149374
 [test_eme_setMediaKeys_before_attach_MediaSource.html]
 skip-if = toolkit == 'android' # bug 1149374
 [test_eme_stream_capture_blocked_case1.html]
 tags=msg capturestream
-skip-if = toolkit == 'android' || toolkit == 'gonk' # android: bug 1149374; gonk: bug 1193351
+skip-if = toolkit == 'android' # bug 1149374
 [test_eme_stream_capture_blocked_case2.html]
 tags=msg capturestream
-skip-if = toolkit == 'android' || toolkit == 'gonk' # android: bug 1149374; gonk: bug 1193351
+skip-if = toolkit == 'android' # bug 1149374
 [test_eme_stream_capture_blocked_case3.html]
 tags=msg capturestream
-skip-if = toolkit == 'android' || toolkit == 'gonk' # android: bug 1149374; gonk: bug 1193351
+skip-if = toolkit == 'android' # bug 1149374
 [test_eme_waitingforkey.html]
-skip-if = toolkit == 'android' || toolkit == 'gonk' # android: bug 1149374; gonk: bug 1193351
+skip-if = toolkit == 'android' # bug 1149374
 [test_empty_resource.html]
 [test_error_in_video_document.html]
 [test_error_on_404.html]
 [test_fastSeek.html]
 [test_fastSeek-forwards.html]
 [test_gmp_playback.html]
 skip-if = (os != 'win' || os_version == '5.1') # Only gmp-clearkey on Windows Vista and later decodes
 [test_imagecapture.html]
@@ -730,17 +726,16 @@ skip-if = (os != 'win' || os_version == 
 [test_load_source.html]
 [test_loop.html]
 [test_media_selection.html]
 [test_media_sniffer.html]
 [test_mediarecorder_avoid_recursion.html]
 skip-if = os == 'win' && !debug # bug 1228605
 tags=msg
 [test_mediarecorder_bitrate.html]
-skip-if = (toolkit == 'gonk') # B2G emulator is too slow to run this without timing out.
 tags=msg
 [test_mediarecorder_creation.html]
 tags=msg capturestream
 [test_mediarecorder_creation_fail.html]
 tags=msg
 [test_mediarecorder_getencodeddata.html]
 tags=msg
 [test_mediarecorder_principals.html]
@@ -774,26 +769,22 @@ tags=msg
 tags=msg capturestream
 [test_mediarecorder_reload_crash.html]
 tags=msg capturestream
 [test_mediarecorder_unsupported_src.html]
 tags=msg
 [test_mediarecorder_webm_support.html]
 skip-if = os == 'android' || arch == 'arm' || arch == 'arm64'
 tags=msg
-[test_mediarecorder_mp4_support.html]
-skip-if = toolkit != 'gonk' || android_version < '17' # Android/Gonk before SDK version 17 does not have the OMX Encoder API.
-tags=msg
 [test_mediarecorder_record_getdata_afterstart.html]
 tags=msg capturestream
 [test_mediatrack_consuming_mediaresource.html]
 [test_mediatrack_consuming_mediastream.html]
 tags=msg
 [test_mediatrack_events.html]
-skip-if = toolkit == 'gonk' && debug # bug 1065924
 [test_mediatrack_parsing_ogg.html]
 [test_mediatrack_replay_from_end.html]
 [test_metadata.html]
 [test_mixed_principals.html]
 [test_mozHasAudio.html]
 [test_multiple_mediastreamtracks.html]
 [test_networkState.html]
 [test_new_audio.html]
@@ -802,28 +793,26 @@ skip-if = toolkit == 'gonk' && debug # b
 [test_paused_after_ended.html]
 [test_play_events.html]
 [test_play_events_2.html]
 [test_play_twice.html]
 # Seamonkey: Bug 598252
 skip-if = appname == "seamonkey"
 [test_playback.html]
 [test_playback_errors.html]
-skip-if = toolkit == 'gonk' # bug 1128845
 [test_playback_rate.html]
 [test_playback_rate_playpause.html]
 [test_playback_reactivate.html]
 [test_played.html]
 [test_preload_actions.html]
 [test_preload_attribute.html]
 [test_preload_suspend.html]
 [test_preserve_playbackrate_after_ui_play.html]
 [test_progress.html]
 [test_reactivate.html]
-skip-if = toolkit == 'gonk' # bug 1128845 on gonk
 [test_readyState.html]
 [test_referer.html]
 [test_replay_metadata.html]
 [test_reset_events_async.html]
 [test_reset_src.html]
 [test_video_dimensions.html]
 [test_resolution_change.html]
 tags=capturestream
@@ -854,27 +843,24 @@ tags=seektonextframe
 [test_source_null.html]
 [test_source_write.html]
 [test_standalone.html]
 [test_streams_autoplay.html]
 tags=msg capturestream
 [test_streams_capture_origin.html]
 tags=msg capturestream
 [test_streams_element_capture.html]
-#x86 only bug 914439, b2g desktop bug 752796
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk')
 tags=msg capturestream
 [test_streams_element_capture_createObjectURL.html]
 tags=msg capturestream
 [test_streams_element_capture_playback.html]
 tags=msg capturestream
 [test_streams_element_capture_reset.html]
 tags=msg capturestream
 [test_streams_gc.html]
-skip-if = buildapp == 'b2g' && toolkit != 'gonk' # bug 1096270
 tags=msg capturestream
 [test_streams_individual_pause.html]
 tags=msg
 [test_streams_srcObject.html]
 tags=msg capturestream
 [test_streams_tracks.html]
 tags=msg capturestream
 [test_texttrack.html]
@@ -896,17 +882,16 @@ tags = webvtt
 [test_timeupdate_small_files.html]
 [test_trackelementevent.html]
 tags = webvtt
 [test_trackelementsrc.html]
 tags = webvtt
 [test_trackevent.html]
 tags = webvtt
 [test_unseekable.html]
-skip-if = toolkit == 'gonk' # bug 1128845 on gonk
 [test_video_to_canvas.html]
 [test_video_in_audio_element.html]
 [test_videoDocumentTitle.html]
 [test_VideoPlaybackQuality.html]
 [test_VideoPlaybackQuality_disabled.html]
 [test_volume.html]
 [test_vttparser.html]
 tags = webvtt
deleted file mode 100644
--- a/dom/media/test/test_mediarecorder_mp4_support.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Media Recording - test mp4 MIME support</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-ok(MediaRecorder.isTypeSupported('video/mp4'), 'Should support video/mp4');
-
-</script>
-</head>
-</html>
--- a/dom/media/tests/mochitest/identity/mochitest.ini
+++ b/dom/media/tests/mochitest/identity/mochitest.ini
@@ -1,14 +1,12 @@
 [DEFAULT]
-# won't run on b2g desktop tests - bug 1119993
-# broken HTTPS on b2g emulator - bug 1135339
 # Android 4.3 - bug 981881
 subsuite = media
-skip-if = android_version == '18' || (buildapp == 'b2g' && toolkit != 'gonk') || (buildapp == 'b2g' && toolkit == 'gonk') || buildapp == 'mulet'
+skip-if = android_version == '18' || (os == 'linux' && !debug && !e10s)
 support-files =
   /.well-known/idp-proxy/idp.js
   identityPcTest.js
   !/dom/media/tests/mochitest/blacksilence.js
   !/dom/media/tests/mochitest/dataChannel.js
   !/dom/media/tests/mochitest/head.js
   !/dom/media/tests/mochitest/network.js
   !/dom/media/tests/mochitest/pc.js
--- a/dom/media/tests/mochitest/mochitest.ini
+++ b/dom/media/tests/mochitest/mochitest.ini
@@ -1,12 +1,11 @@
 [DEFAULT]
 tags = msg webrtc
 subsuite = media
-skip-if = (buildapp == 'mulet') || (toolkit == 'gonk') # b2g (bug 1306391)
 support-files =
   head.js
   dataChannel.js
   mediaStreamPlayback.js
   network.js
   nonTrickleIce.js
   pc.js
   templates.js
@@ -93,17 +92,17 @@ skip-if = (android_version == '18') # an
 skip-if = toolkit == 'android' # websockets don't work on android (bug 1266217)
 [test_peerConnection_basicAudioNATRelay.html]
 skip-if = toolkit == 'android' # websockets don't work on android (bug 1266217)
 [test_peerConnection_basicAudioNATRelayTCP.html]
 skip-if = toolkit == 'android' # websockets don't work on android (bug 1266217)
 [test_peerConnection_basicAudioRequireEOC.html]
 skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_basicAudioPcmaPcmuOnly.html]
-skip-if = android_version == '18' # b2g (Bug 1059867)
+skip-if = android_version == '18'
 [test_peerConnection_basicAudioDynamicPtMissingRtpmap.html]
 skip-if = (android_version == '18') # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_basicAudioVideo.html]
 skip-if = (android_version == '18') # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_basicAudioVideoCombined.html]
 skip-if = (android_version == '18') # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_basicAudioVideoNoBundle.html]
 skip-if = (android_version == '18') # android(Bug 1189784, timeouts on 4.3 emulator)
--- a/dom/media/webaudio/test/blink/mochitest.ini
+++ b/dom/media/webaudio/test/blink/mochitest.ini
@@ -1,13 +1,12 @@
 [DEFAULT]
 tags=msg
 tags = webaudio
 subsuite = media
-skip-if = ((buildapp == 'b2g') && (toolkit != 'gonk' || debug)) #b2g-debug,b2g-desktop(bug 916135)
 support-files =
   biquad-filters.js
   biquad-testing.js
   ../webaudio.js
 
 [test_biquadFilterNodeAllPass.html]
 [test_biquadFilterNodeAutomation.html]
 skip-if = true # Known problems with Biquad automation, e.g. Bug 1155709
--- a/dom/media/webaudio/test/mochitest.ini
+++ b/dom/media/webaudio/test/mochitest.ini
@@ -1,13 +1,12 @@
 [DEFAULT]
 tags=msg
 tags = webaudio
 subsuite = media
-skip-if = ((buildapp == 'b2g') && (toolkit != 'gonk' || debug)) #b2g-debug,b2g-desktop(bug 916135)
 support-files =
   audio-expected.wav
   audio-mono-expected-2.wav
   audio-mono-expected.wav
   audio-quad.wav
   audio.ogv
   audiovideo.mp4
   audioBufferSourceNodeDetached_worker.js
@@ -41,23 +40,22 @@ support-files =
 [test_audioBufferSourceNodeLoop.html]
 [test_audioBufferSourceNodeLoopStartEnd.html]
 [test_audioBufferSourceNodeLoopStartEndSame.html]
 [test_audioBufferSourceNodeDetached.html]
 skip-if = (toolkit == 'android' && debug) || os == 'win' # bug 1127845, bug 1138468
 [test_audioBufferSourceNodeNoStart.html]
 [test_audioBufferSourceNodeNullBuffer.html]
 [test_audioBufferSourceNodeOffset.html]
-skip-if = (toolkit == 'gonk') || (toolkit == 'android') || debug #bug 906752
+skip-if = (toolkit == 'android') || debug #bug 906752
 [test_audioBufferSourceNodePassThrough.html]
 [test_audioBufferSourceNodeRate.html]
 [test_AudioContext.html]
 [test_AudioContext_disabled.html]
 [test_audioContextSuspendResumeClose.html]
-skip-if = buildapp == 'mulet'
 tags=capturestream
 [test_audioDestinationNode.html]
 [test_AudioListener.html]
 [test_AudioNodeDevtoolsAPI.html]
 [test_audioParamChaining.html]
 [test_AudioParamDevtoolsAPI.html]
 [test_audioParamExponentialRamp.html]
 [test_audioParamGain.html]
@@ -138,17 +136,16 @@ skip-if = toolkit == 'android' # bug 105
 [test_dynamicsCompressorNode.html]
 [test_dynamicsCompressorNodePassThrough.html]
 [test_dynamicsCompressorNodeWithGain.html]
 [test_gainNode.html]
 [test_gainNodeInLoop.html]
 [test_gainNodePassThrough.html]
 [test_iirFilterNodePassThrough.html]
 [test_maxChannelCount.html]
-skip-if = buildapp == 'mulet'
 [test_mediaDecoding.html]
 [test_mediaElementAudioSourceNode.html]
 tags=capturestream
 [test_mediaElementAudioSourceNodeFidelity.html]
 tags=capturestream
 [test_mediaElementAudioSourceNodePassThrough.html]
 tags=capturestream
 skip-if = toolkit == 'android' # bug 1145816
@@ -164,17 +161,17 @@ tags=capturestream
 [test_mediaStreamAudioSourceNodeNoGC.html]
 [test_mediaStreamAudioSourceNodePassThrough.html]
 [test_mediaStreamAudioSourceNodeResampling.html]
 tags=capturestream
 [test_mixingRules.html]
 skip-if = toolkit == 'android' # bug 1091965
 [test_mozaudiochannel.html]
 # Android: bug 1061675; OSX 10.6: bug 1097721
-skip-if = (toolkit == 'gonk' && !debug) || (toolkit == 'android') || (os == 'mac' && os_version == '10.6')
+skip-if = (toolkit == 'android') || (os == 'mac' && os_version == '10.6')
 [test_nodeToParamConnection.html]
 [test_OfflineAudioContext.html]
 [test_offlineDestinationChannelCountLess.html]
 [test_offlineDestinationChannelCountMore.html]
 [test_oscillatorNode.html]
 [test_oscillatorNode2.html]
 [test_oscillatorNodeNegativeFrequency.html]
 [test_oscillatorNodePassThrough.html]
--- a/dom/media/webspeech/recognition/test/mochitest.ini
+++ b/dom/media/webspeech/recognition/test/mochitest.ini
@@ -1,22 +1,21 @@
 [DEFAULT]
 tags=msg
-skip-if = buildapp == 'b2g' # Bug 1191270, bug 1037287, bug 967606, bug 1096400 etc
 subsuite = media
 support-files =
   head.js
   hello.ogg
   hello.ogg^headers^
   silence.ogg
   silence.ogg^headers^
 [test_abort.html]
 skip-if = toolkit == 'android' # bug 1037287
 [test_audio_capture_error.html]
 [test_call_start_from_end_handler.html]
 tags=capturestream
 skip-if = (android_version == '18' && debug) # bug 967606
 [test_nested_eventloop.html]
-skip-if = buildapp == 'mulet' || toolkit == 'android'
+skip-if = toolkit == 'android'
 [test_preference_enable.html]
 [test_recognition_service_error.html]
 [test_success_without_recognition_service.html]
 [test_timeout.html]