From e696c7780e6567f24fa6eb78cab94ab594061c46 Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Sun, 31 Jan 2016 00:45:31 -0800 Subject: [PATCH] Bug 1171255 - disable test_peerConnection_twoAudioVideoStreams.html on Linux debug e10s for frequent hangs --- dom/media/tests/mochitest/mochitest.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dom/media/tests/mochitest/mochitest.ini b/dom/media/tests/mochitest/mochitest.ini index 4abdca22dc2..bd0ced789f5 100644 --- a/dom/media/tests/mochitest/mochitest.ini +++ b/dom/media/tests/mochitest/mochitest.ini @@ -167,8 +167,8 @@ skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (android_version == '18' & [test_peerConnection_twoAudioTracksInOneStream.html] skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (android_version == '18' && debug) # b2g (Bug 1059867), android(Bug 1189784, timeouts on 4.3 emulator) [test_peerConnection_twoAudioVideoStreams.html] -# b2g(Bug 960442, video support for WebRTC is disabled on b2g), Bug 1180000 for Linux debug e10s, android(Bug 1189784, timeouts on 4.3 emulator) -skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' +# b2g(Bug 960442, video support for WebRTC is disabled on b2g), Bug 1171255 for Linux debug e10s, android(Bug 1189784, timeouts on 4.3 emulator) +skip-if = toolkit == 'gonk' || buildapp == 'mulet' || (os == 'linux' && debug && e10s) || android_version == '18' [test_peerConnection_twoAudioVideoStreamsCombined.html] # b2g(Bug 960442, video support for WebRTC is disabled on b2g), Bug 1180000 for Linux debug e10s, android(Bug 1189784, timeouts on 4.3 emulator) skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18'