Commit 23dabd43 authored Jul 27, 2015 by Wes Kocher

Merge m-c to b2ginbound, a=merge

parents d1417e66 bbaddcb2

dom/plugins/test/mochitest/chrome.ini

+1 −1

Original line number	Diff line number	Diff line
		[DEFAULT]
		skip-if = (buildapp == 'b2g' \|\| buildapp == 'mulet') \|\| (os == "mac" && os_version == "10.6" && debug) #bug 1188052 for OSX 10.6
		skip-if = (buildapp == 'b2g' \|\| buildapp == 'mulet')
		support-files =
		hang_test.js
		privatemode_perwindowpb.xul

dom/plugins/test/mochitest/mochitest.ini

+1 −1

Original line number	Diff line number	Diff line
		[DEFAULT]
		skip-if = ((buildapp == 'mulet' \|\| buildapp == 'b2g') && toolkit != 'gonk') \|\| (e10s && debug) \|\| (os == "mac" && os_version == "10.6" && debug) #b2g-desktop(tests that use plugins), bug 1188052 for OSX 10.6
		skip-if = ((buildapp == 'mulet' \|\| buildapp == 'b2g') && toolkit != 'gonk') \|\| (e10s && debug) #b2g-desktop(tests that use plugins)
		support-files =
		307-xo-redirect.sjs
		crashing_subpage.html