From 4ab8a736fb1c67debb7e654afdeffd526f76320f Mon Sep 17 00:00:00 2001 From: Randell Jesup Date: Mon, 8 Aug 2016 17:22:19 -0400 Subject: [PATCH] Bug 1271585: Disable trackCloning tests on android and addtrack_removetrackevents r=pehrsons --- dom/media/tests/mochitest/mochitest.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dom/media/tests/mochitest/mochitest.ini b/dom/media/tests/mochitest/mochitest.ini index 16394015d0a6..cd70be21165e 100644 --- a/dom/media/tests/mochitest/mochitest.ini +++ b/dom/media/tests/mochitest/mochitest.ini @@ -45,6 +45,7 @@ skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # [test_getUserMedia_addTrackRemoveTrack.html] skip-if = (toolkit == 'gonk' || buildapp == 'mulet' && debug) # debug-only failure [test_getUserMedia_addtrack_removetrack_events.html] +skip-if = android_version == '18' # emulator seems to be too slow on android(Bug 1189784, timeouts on 4.3 emulator) [test_getUserMedia_basicAudio.html] skip-if = (toolkit == 'gonk' || buildapp == 'mulet' && debug) # debug-only failure [test_getUserMedia_basicVideo.html] @@ -206,7 +207,7 @@ skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g(Bug 960442, video suppo [test_peerConnection_trackDisabling_clones.html] skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator) [test_peerConnection_trackDisabling.html] -skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g(Bug 960442, video support for WebRTC is disabled on b2g) +skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator) [test_peerConnection_twoAudioStreams.html] skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (android_version == '18' && debug) # b2g (Bug 1059867), android(Bug 1189784, timeouts on 4.3 emulator) [test_peerConnection_twoAudioTracksInOneStream.html]