Merge mozilla-central to autoland
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 08 Aug 2016 12:04:33 +0200
changeset 308558 720b5d2c84d5b253d4dfde4897e13384dc97a46a
parent 308549 4fa9a49c57aa0fdc4c3506c6aae736e3bb2594d3 (current diff)
parent 308557 e78975b53563d80c99ebfbdf8a9fbf6b829a8a48 (diff)
child 308559 1fa92a8698a9f605528701fb8cf33608e3e19650
child 308656 5ff96be046af749644327f75b21ce9437d766886
child 308739 5f01a72b59442c1c16eb8103f7e030195ba56743
push id31142
push usercbook@mozilla.com
push dateMon, 08 Aug 2016 10:04:43 +0000
treeherderautoland@720b5d2c84d5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone51.0a1
first release with
nightly linux32
720b5d2c84d5 / 51.0a1 / 20160809030200 / files
nightly linux64
720b5d2c84d5 / 51.0a1 / 20160809030200 / files
nightly mac
720b5d2c84d5 / 51.0a1 / 20160809030200 / files
nightly win32
720b5d2c84d5 / 51.0a1 / 20160809030200 / files
nightly win64
720b5d2c84d5 / 51.0a1 / 20160809030200 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-central to autoland
modules/libpref/init/all.js
--- a/browser/base/content/test/urlbar/browser.ini
+++ b/browser/base/content/test/urlbar/browser.ini
@@ -1,16 +1,17 @@
 [DEFAULT]
 support-files =
   dummy_page.html
   head.js
 
 [browser_URLBarSetURI.js]
 skip-if = (os == "linux" || os == "mac") && debug # bug 970052, bug 970053
 [browser_action_keyword.js]
+skip-if = os == "linux" # Bug 1188154
 [browser_action_keyword_override.js]
 [browser_action_searchengine.js]
 [browser_action_searchengine_alias.js]
 [browser_autocomplete_a11y_label.js]
 [browser_autocomplete_autoselect.js]
 [browser_autocomplete_cursor.js]
 [browser_autocomplete_edit_completed.js]
 [browser_autocomplete_enter_race.js]
@@ -27,17 +28,17 @@ skip-if = (os == "linux" || os == "mac")
 subsuite = clipboard
 [browser_bug562649.js]
 [browser_bug623155.js]
 support-files =
   redirect_bug623155.sjs
 [browser_bug783614.js]
 [browser_canonizeURL.js]
 [browser_locationBarCommand.js]
-skip-if = os == "linux" # Linux: Intermittent failures, bug 917535
+skip-if = true # bug 917535, bug 1289765
 [browser_locationBarExternalLoad.js]
 [browser_moz_action_link.js]
 [browser_removeUnsafeProtocolsFromURLBarPaste.js]
 subsuite = clipboard
 [browser_search_favicon.js]
 [browser_tabMatchesInAwesomebar.js]
 support-files =
   moz.png
--- a/browser/components/uitour/test/browser.ini
+++ b/browser/components/uitour/test/browser.ini
@@ -26,16 +26,17 @@ skip-if = os == "linux" # Intermittent f
 [browser_UITour3.js]
 skip-if = os == "linux" # Linux: Bug 986760, Bug 989101.
 [browser_UITour_availableTargets.js]
 [browser_UITour_annotation_size_attributes.js]
 [browser_UITour_defaultBrowser.js]
 [browser_UITour_detach_tab.js]
 [browser_UITour_forceReaderMode.js]
 [browser_UITour_heartbeat.js]
+skip-if = os == "win" # Bug 1277107
 [browser_UITour_modalDialog.js]
 skip-if = os != "mac" # modal dialog disabling only working on OS X.
 [browser_UITour_observe.js]
 [browser_UITour_panel_close_annotation.js]
 skip-if = true # Disabled due to frequent failures, bugs 1026310 and 1032137
 [browser_UITour_pocket.js]
 skip-if = true # Disabled pending removal of pocket UI Tour
 [browser_UITour_registerPageID.js]
--- a/browser/modules/test/browser.ini
+++ b/browser/modules/test/browser.ini
@@ -2,17 +2,17 @@
 support-files =
   head.js
 
 [browser_BrowserUITelemetry_buckets.js]
 [browser_BrowserUITelemetry_defaults.js]
 [browser_BrowserUITelemetry_sidebar.js]
 [browser_BrowserUITelemetry_syncedtabs.js]
 [browser_CaptivePortalWatcher.js]
-skip-if = os == "linux" || os == "win" # Bug 1279491
+skip-if = os == "linux" || os == "win" || (os == "mac" && debug && e10s) # Bug 1279491, Bug 1287714 for OS X debug e10s
 [browser_ProcessHangNotifications.js]
 skip-if = !e10s
 [browser_ContentSearch.js]
 support-files =
   contentSearch.js
   contentSearchBadImage.xml
   contentSearchSuggestions.sjs
   contentSearchSuggestions.xml
--- a/layout/generic/test/chrome.ini
+++ b/layout/generic/test/chrome.ini
@@ -8,10 +8,10 @@ support-files =
 
 [test_backspace_delete.xul]
 skip-if = true # Bug 1163311
 [test_bug469613.xul]
 [test_bug469774.xul]
 [test_bug508115.xul]
 [test_bug514732-2.xul]
 [test_bug632379.xul]
-skip-if = buildapp == 'mulet'
+skip-if = buildapp == 'mulet' || os == 'linux' # Bug 1207914 for Linux
 [test_selection_underline.html]
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -5137,17 +5137,17 @@ pref("browser.safebrowsing.provider.goog
 pref("browser.safebrowsing.provider.google4.gethashURL", "https://safebrowsing.googleapis.com/v4/fullHashes:find?$req=%REQUEST_BASE64%&$ct=application/x-protobuf&key=%GOOGLE_API_KEY%");
 pref("browser.safebrowsing.provider.google4.reportURL", "https://safebrowsing.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
 
 pref("browser.safebrowsing.reportPhishMistakeURL", "https://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%&url=");
 pref("browser.safebrowsing.reportPhishURL", "https://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%&url=");
 pref("browser.safebrowsing.reportMalwareMistakeURL", "https://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%&url=");
 
 // The table and global pref for blocking plugin content
-pref("browser.safebrowsing.blockedURIs.enabled", false);
+pref("browser.safebrowsing.blockedURIs.enabled", true);
 pref("urlclassifier.blockedTable", "test-block-simple,mozplugin-block-digest256");
 
 // The protocol version we communicate with mozilla server.
 pref("browser.safebrowsing.provider.mozilla.pver", "2.2");
 pref("browser.safebrowsing.provider.mozilla.lists", "base-track-digest256,mozstd-trackwhite-digest256,content-track-digest256,mozplugin-block-digest256,mozplugin2-block-digest256");
 pref("browser.safebrowsing.provider.mozilla.updateURL", "https://shavar.services.mozilla.com/downloads?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2");
 pref("browser.safebrowsing.provider.mozilla.gethashURL", "https://shavar.services.mozilla.com/gethash?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2");
 // Set to a date in the past to force immediate download in new profiles.
--- a/toolkit/content/tests/chrome/chrome.ini
+++ b/toolkit/content/tests/chrome/chrome.ini
@@ -132,16 +132,17 @@ skip-if = buildapp == 'mulet'
 [test_panelfrommenu.xul]
 skip-if = buildapp == 'mulet'
 [test_popup_anchor.xul]
 [test_popup_anchoratrect.xul]
 skip-if = os == 'linux' # 1167694
 [test_popup_attribute.xul]
 skip-if = os == 'linux' && asan #Bug 1131634
 [test_popup_button.xul]
+skip-if = os == 'linux' && asan # Bug 1281360
 [test_popup_coords.xul]
 [test_popup_keys.xul]
 [test_popup_moveToAnchor.xul]
 [test_popup_preventdefault.xul]
 [test_popup_preventdefault_chrome.xul]
 [test_popup_recreate.xul]
 [test_popup_scaled.xul]
 [test_popup_tree.xul]