From dd0ca3004d7ffd4f129acf7a95ebbd755d3f560c Mon Sep 17 00:00:00 2001 From: Eugen Sawin Date: Fri, 4 Mar 2016 21:51:28 +0100 Subject: [PATCH] Bug 1232308 - [1.1] Disable MediaRecorder tests requiring video encoding. r=snorp --- dom/media/test/mochitest.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dom/media/test/mochitest.ini b/dom/media/test/mochitest.ini index a35cff68ab4c..9b1040af7e17 100644 --- a/dom/media/test/mochitest.ini +++ b/dom/media/test/mochitest.ini @@ -690,7 +690,7 @@ skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 914439 skip-if = os == 'win' && !debug # bug 1228605 tags=msg [test_mediarecorder_bitrate.html] -skip-if = (toolkit == 'gonk' || android_version == '10') # B2G emulator is too slow to run this without timing out and Android doesn't like the seek.webm +skip-if = (toolkit == 'gonk' || toolkit == 'android') # B2G emulator is too slow to run this without timing out and Fennec does not support video recording tags=msg [test_mediarecorder_creation.html] tags=msg capturestream @@ -707,7 +707,7 @@ tags=msg [test_mediarecorder_record_audionode.html] tags=msg [test_mediarecorder_record_canvas_captureStream.html] -skip-if = android_version < '17' # Android/Gonk before SDK version 17 does not have the OMX Encoder API. +skip-if = (android_version < '17' || toolkit == 'android') # Android/Gonk before SDK version 17 does not have the OMX Encoder API and Fennec does not support video recording tags=msg [test_mediarecorder_record_changing_video_resolution.html] skip-if = android_version < '17' # Android/Gonk before SDK version 17 does not have the OMX Encoder API.