Merge m-c to fx-team a=merge CLOSED TREE

This commit is contained in:
Wes Kocher 2014-10-06 21:06:10 -07:00
commit db9d843ea2
3 changed files with 2 additions and 3 deletions

View File

@ -22,7 +22,7 @@
# do ok(true, "Type not supported") and stop the test.
[DEFAULT]
skip-if = buildapp == 'mulet' || contentSandbox != 'off' # contentSandbox(Bug 1042735)
skip-if = buildapp == 'mulet'
support-files =
320x240.ogv
320x240.ogv^headers^

View File

@ -1,5 +1,5 @@
[DEFAULT]
skip-if = ((buildapp == 'mulet' || buildapp == 'b2g') && (toolkit != 'gonk' || debug)) || contentSandbox != 'off' #b2g-debug,b2g-desktop(bug 916135); contentSandbox(Bug 1042735)
skip-if = ((buildapp == 'mulet' || buildapp == 'b2g') && (toolkit != 'gonk' || debug)) #b2g-debug,b2g-desktop(bug 916135)
support-files =
audio-expected.wav
audio-mono-expected-2.wav

View File

@ -1,5 +1,4 @@
[DEFAULT]
skip-if = contentSandbox != 'off' # contentSandbox(Bug 1042735)
support-files =
head.js
constraints.js