Merge m-c to fx-team, a=merge
authorWes Kocher <wkocher@mozilla.com>
Mon, 27 Jul 2015 15:46:39 -0700
changeset 254830 9df53dd7dc96384f6a880d3905e6d6fc2717162e
parent 254829 4beff7208d94ccecfe7c25d40e60a2d64a42da05 (current diff)
parent 254806 2e835ae56ddd9ee291effcc861e276a6878c324f (diff)
child 254831 3c7cfb8a8ec71c8c30edf3629c217f8853dd0ac3
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')
+skip-if = (buildapp == 'b2g' || buildapp == 'mulet') || (os == "mac" && os_version == "10.6" && debug) #bug 1188052 for OSX 10.6
 support-files =
   hang_test.js
   privatemode_perwindowpb.xul
   utils.js
 
 [test_bug479979.xul]
 [test_bug751809.html]
 [test_busy_hang.xul]