Merge m-c to f-t
authorPhil Ringnalda <philringnalda@gmail.com>
Sun, 15 Nov 2015 19:18:42 -0800
changeset 272607 04fb61e343addd47b88ac694041c0bce5a98cfc0
parent 272602 3f0651985bf0e3403b5fd4984a907813689ee3a9 (current diff)
parent 272606 bc74dbdea094059d5f1d353a2585b4f6352b6ec4 (diff)
child 272608 c3cb49558709e719781152e44013378d706b79ae
push id16246
push userphilringnalda@gmail.com
push dateMon, 16 Nov 2015 03:18:48 +0000
treeherderfx-team@04fb61e343ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone45.0a1
Merge m-c to f-t
--- a/dom/media/tests/mochitest/ipc/mochitest.ini
+++ b/dom/media/tests/mochitest/ipc/mochitest.ini
@@ -1,9 +1,9 @@
 [DEFAULT]
 tags=msg
 support-files =
   ipc.json
 
 skip-if = e10s
 
 [test_ipc.html]
-skip-if =  buildapp == 'b2g' || toolkit == 'android' #bug 910661 # b2g(nested ipc not working) b2g-debug(debug-only failure) b2g-desktop(nested ipc not working)
+skip-if =  buildapp == 'b2g' || buildapp == 'mulet' || toolkit == 'android' #bug 910661 # b2g(nested ipc not working) b2g-debug(debug-only failure) b2g-desktop(nested ipc not working)
--- a/dom/media/tests/mochitest/mochitest.ini
+++ b/dom/media/tests/mochitest/mochitest.ini
@@ -1,12 +1,12 @@
 [DEFAULT]
 # strictContentSandbox - bug 1042735, Android 2.3 - bug 981881
 tags = msg webrtc
-skip-if = (os == 'win' && strictContentSandbox) || android_version == '10' ||  (buildapp == 'mulet') || (toolkit == 'gonk' && debug) # b2g(Either bug 1171118 or bug 1169838, take your pick)
+skip-if = (os == 'win' && strictContentSandbox) || android_version == '10' || (buildapp == 'mulet') || (toolkit == 'gonk' && debug) # b2g(Either bug 1171118 or bug 1169838, take your pick)
 support-files =
   head.js
   dataChannel.js
   mediaStreamPlayback.js
   network.js
   nonTrickleIce.js
   pc.js
   templates.js
--- a/dom/media/webspeech/recognition/test/mochitest.ini
+++ b/dom/media/webspeech/recognition/test/mochitest.ini
@@ -1,11 +1,11 @@
 [DEFAULT]
 tags=msg
-skip-if = buildapp == 'b2g' # Bug 1191270, bug 1037287, bug 967606, bug 1096400, etc
+skip-if = buildapp == 'b2g' || buildapp == 'mulet' # Bug 1191270, bug 1037287, bug 967606, bug 1096400, etc
 support-files =
   head.js
   hello.ogg
   hello.ogg^headers^
   silence.ogg
   silence.ogg^headers^
 
 [test_abort.html]
--- a/dom/media/webspeech/synth/test/mochitest.ini
+++ b/dom/media/webspeech/synth/test/mochitest.ini
@@ -1,10 +1,11 @@
 [DEFAULT]
 tags=msg
+skip-if = buildapp == 'mulet'
 support-files =
   common.js
   file_setup.html
   file_speech_queue.html
   file_speech_simple.html
   file_speech_cancel.html
   file_indirect_service_events.html
   file_global_queue.html