Merge m-c to fx-team, a=merge
authorWes Kocher <wkocher@mozilla.com>
Mon, 27 Jul 2015 20:05:03 -0700
changeset 254839 3f8000cec1c4feb0953f627d53725e519324bcdf
parent 254838 5d5441040c8c86e6d8a17210c0095293ced472fe (current diff)
parent 254810 33dc8a83cfc0d1b609aa6e1f75b0c81adb5c4aa1 (diff)
child 254840 49a2e084409862280aba5e93ca6de846808e85a3
push id29122
push usercbook@mozilla.com
push dateTue, 28 Jul 2015 14:13:05 +0000
treeherdermozilla-central@07132b9fbc10 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge m-c to fx-team, a=merge
--- 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