Merge mozilla-central to autoland. a=merge CLOSED TREE

browser/base/content/test/general/browser.ini

@@ -163,7 +163,6 @@ skip-if = toolkit != "cocoa" # Because of tests for supporting pasting from Serv
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 skip-if = fission
 [browser_bug575830.js]
-skip-if = os == 'mac' # macosx1014 due to 1526628
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug577121.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
@@ -324,7 +323,6 @@ skip-if = fission || os == 'win' # Bug 1384127
 support-files =
   refresh_header.sjs
   refresh_meta.sjs
-skip-if = (os == 'mac') # permafail on macosx1014, see 1559410
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_relatedTabs.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.

browser/base/content/test/performance/browser.ini

@@ -40,7 +40,7 @@ skip-if = (verify && !debug && (os == 'win')) || (!debug && (os == 'win') && (bi
 [browser_tabswitch.js]
 [browser_toolbariconcolor_restyles.js]
 [browser_urlbar_keyed_search.js]
-skip-if = (os == 'win' && bits == 32) || (os == 'mac') # Disabled on Win32 because of intermittent OOM failures (bug 1448241), macosx1014 due to 1565619
+skip-if = (os == 'win' && bits == 32) # Disabled on Win32 because of intermittent OOM failures (bug 1448241).
 [browser_urlbar_search.js]
 skip-if = (debug || ccov) && (os == 'linux' || os == 'win') || (os == 'win' && bits == 32) # Disabled on Linux and Windows debug and ccov due to intermittent timeouts. Bug 1414126, bug 1426611. Disabled on Win32 because of intermittent OOM failures (bug 1448241)
 [browser_window_resize.js]

browser/base/content/test/performance/io/browser.ini

@@ -19,7 +19,5 @@ environment =
   MOZ_PROFILER_STARTUP_FEATURES=js,mainthreadio
   MOZ_PROFILER_STARTUP_ENTRIES=10000000
 [../browser_startup_mainthreadio.js]
-skip-if = (os == 'mac') # macosx1014 due to 1554789, 1557221
 [../browser_startup_content_mainthreadio.js]
 [../browser_startup_syncIPC.js]
-skip-if = (os == 'mac') # macosx1014 due to 1561940, 1562360

browser/base/content/test/permissions/browser.ini

@@ -25,7 +25,7 @@ support-files =
   browser_autoplay_blocked_slow.sjs
   browser_autoplay_muted.html
   ../general/audio.ogg
-skip-if = verify && os == 'linux' && debug || os == 'mac'# Bug 1483648, macosx1014 due to 1538602
+skip-if = verify && os == 'linux' && debug # Bug 1483648
 [browser_temporary_permissions_expiry.js]
 [browser_temporary_permissions_navigation.js]
 [browser_temporary_permissions_tabs.js]

browser/base/content/test/webrtc/browser.ini

@@ -4,22 +4,17 @@ support-files =
   get_user_media_in_frame.html
   get_user_media_content_script.js
   head.js
-; skip-if = os == 'mac' # multiple macosx1014 failures; 1259330, 1565738, 1567656, 1393761, 1567735
+
 [browser_devices_get_user_media.js]
-fail-if = os == 'mac' # macosx1014 fails due to 1259330
-skip-if = fission || (os == "linux" && debug) # linux: bug 976544,
+skip-if = fission || (os == "linux" && debug) # linux: bug 976544
 [browser_devices_get_user_media_anim.js]
-fail-if = os == 'mac' # macosx1014 permafail, see 1565738
 [browser_devices_get_user_media_default_permissions.js]
-fail-if = os == 'mac' # macosx1014 fails due to 1567656
 [browser_devices_get_user_media_in_frame.js]
-fail-if = os == 'mac' # macosx1014 due to 1567746
 skip-if = debug # bug 1369731
 [browser_devices_get_user_media_multi_process.js]
 fail-if = fission
 skip-if = debug && (os == "win" || os == "mac") # bug 1393761
 [browser_devices_get_user_media_paused.js]
-fail-if = os == 'mac' # macosx1014 due to 1567735
 skip-if = (os == "win" && !debug) || (os =="linux" && !debug && bits == 64) #Bug 1440900
 [browser_devices_get_user_media_screen.js]
 skip-if = (os == 'linux') # Bug 1503991

browser/components/extensions/test/browser/browser-common.ini

@@ -63,7 +63,6 @@ skip-if = debug # Bug 1522164
 [browser_ext_browserAction_simple.js]
 [browser_ext_browserAction_telemetry.js]
 [browser_ext_browserAction_theme_icons.js]
-skip-if = (os == 'mac') # macosx1014 due to 1479256
 [browser_ext_browsingData_formData.js]
 [browser_ext_browsingData_history.js]
 [browser_ext_browsingData_indexedDB.js]

browser/components/sessionstore/test/browser.ini

@@ -84,7 +84,6 @@ skip-if = fission || debug # bug 1211084
 [browser_backup_recovery.js]
 skip-if = (verify && debug && (os == 'linux'))
 [browser_broadcast.js]
-skip-if = (os == 'mac') # macosx1014 fails due to 1533895
 [browser_capabilities.js]
 [browser_cleaner.js]
 [browser_crashedTabs.js]

browser/components/shell/test/browser.ini

@@ -5,5 +5,5 @@ skip-if = os != "linux"
 [browser_633221.js]
 skip-if = os != "linux"
 [browser_1119088.js]
-skip-if = os != "mac" || verify || (os == 'mac') # macosx1014 permafails, see 1549046
+skip-if = os != "mac" || verify
 [browser_setDesktopBackgroundPreview.js]

browser/components/urlbar/tests/browser/browser.ini

@@ -181,7 +181,6 @@ support-files =
   searchSuggestionEngine.sjs
 [browser_URLBarSetURI.js]
 [browser_urlbarStop.js]
-skip-if = (os == 'mac') # macosx1014 fails due to 1485288
 [browser_urlbarStopSearchOnSelection.js]
 support-files =
   searchSuggestionEngineSlow.xml

layout/xul/test/browser.ini

@@ -2,7 +2,7 @@
 
 [browser_bug685470.js]
 [browser_bug703210.js]
-skip-if = os == 'linux' || (verify && (os == 'linux')) || os == 'mac' # Bug 1382428, macosx1014 due to 1567736
+skip-if = os == 'linux' || (verify && (os == 'linux')) # Bug 1382428
 [browser_bug706743.js]
 skip-if = (os == 'linux') || e10s # Bug 1157576
 [browser_bug1163304.js]

taskcluster/ci/test/test-platforms.yml

@@ -308,11 +308,27 @@ macosx1014-64-ccov/debug:
     test-sets:
         - macosx1014-64-tests
 
+macosx1010-64/debug:
+    build-platform: macosx64/debug
+    test-sets:
+        - macosx64-tests
+
 macosx1010-64-shippable/opt:
     build-platform: macosx64-shippable/opt
     test-sets:
+        - macosx64-tests
         - desktop-screenshot-capture
 
+macosx1010-64-devedition/opt:
+    build-platform: macosx64-devedition-nightly/opt
+    test-sets:
+        - macosx64-tests
+
+macosx1010-64-ccov/debug:
+    build-platform: macosx64-ccov/debug
+    test-sets:
+        - macosx64-tests
+
 ##
 # Android platforms (matching /android-em.*/)
 #

taskcluster/ci/test/test-sets.yml

@@ -322,7 +322,7 @@ macosx1014-64-tests:
     - marionette
     - mochitest
     - mochitest-a11y
-    - mochitest-browser-chrome
+    # - mochitest-browser-chrome
     - mochitest-chrome
     - mochitest-devtools-chrome
     - mochitest-devtools-webreplay
@@ -347,6 +347,10 @@ macosx1014-64-qr-tests:
     - crashtest
     - reftest
 
+macosx64-tests:
+    - mochitest-browser-chrome
+    # - mochitest-webgl2-ext test timeouts
+
 macosx64-talos:
     - talos-bcv
     - talos-chrome

toolkit/mozapps/extensions/test/xpinstall/browser.ini

@@ -36,7 +36,6 @@ skip-if = fission
 [browser_badhash.js]
 [browser_badhashtype.js]
 [browser_block_fullscreen_prompt.js]
-skip-if = (os == 'mac') # macosx1014 fails, see 1558326
 [browser_bug540558.js]
 [browser_bug611242.js]
 [browser_bug638292.js]