mozilla-central: changeset 254826:614c8d5ea09f989451adeea5c51765cb7f2577c5

author	Wes Kocher <wkocher@mozilla.com>
	Mon, 27 Jul 2015 20:04:39 -0700
changeset 254826	614c8d5ea09f989451adeea5c51765cb7f2577c5
parent 254825	16a11dc703d250533bfa53f85b0818b71b8473e4 (current diff)
parent 254810	33dc8a83cfc0d1b609aa6e1f75b0c81adb5c4aa1 (diff)
child 254827	b23e806307e1e8681f9a8ad5fb3586012b2be28f
push id	29121
push user	cbook@mozilla.com
push date	Tue, 28 Jul 2015 14:09:28 +0000
treeherder	mozilla-central@d08100cfaf4d [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	merge
milestone	42.0a1
first release with	nightly linux32 2ee9895e032c / 42.0a1 / 20150729030208 / files nightly linux64 2ee9895e032c / 42.0a1 / 20150729030208 / files nightly mac 2ee9895e032c / 42.0a1 / 20150729030208 / files nightly win32 2ee9895e032c / 42.0a1 / 20150729030208 / files nightly win64 2ee9895e032c / 42.0a1 / 20150729030208 / files
last release without	nightly linux32 33dc8a83cfc0 / 42.0a1 / 20150728030209 / files nightly linux64 33dc8a83cfc0 / 42.0a1 / 20150728030209 / files nightly mac 33dc8a83cfc0 / 42.0a1 / 20150728030209 / files nightly win32 33dc8a83cfc0 / 42.0a1 / 20150728030209 / files nightly win64 33dc8a83cfc0 / 42.0a1 / 20150728030209 / files

--- a/dom/plugins/test/mochitest/chrome.ini
+++ b/dom/plugins/test/mochitest/chrome.ini
@@ -1,10 +1,10 @@
 [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
   utils.js
 
 [test_bug479979.xul]
 [test_bug751809.html]
 [test_busy_hang.xul]

--- a/dom/plugins/test/mochitest/mochitest.ini
+++ b/dom/plugins/test/mochitest/mochitest.ini
@@ -1,10 +1,10 @@
 [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
   file_bug738396.html
   file_bug771202.html
   file_bug863792.html
   large-pic.jpg
   loremipsum.txt