From cd4986a6d0ac2b0c2318822b0b3fe39894e1e1d7 Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Sun, 7 Aug 2016 15:26:35 -0700 Subject: [PATCH 1/7] Bug 1207914 - Skip test_bug632379.xul on Linux for constant timeouts --- layout/generic/test/chrome.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/generic/test/chrome.ini b/layout/generic/test/chrome.ini index 1885beadcb34..bf35bf56f142 100644 --- a/layout/generic/test/chrome.ini +++ b/layout/generic/test/chrome.ini @@ -13,5 +13,5 @@ skip-if = true # Bug 1163311 [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] From 628f428f291bbeb40d226bff4d1fb03d51717d67 Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Sun, 7 Aug 2016 15:34:55 -0700 Subject: [PATCH 2/7] Bug 1287714 - Skip browser_CaptivePortalWatcher.js on OS X debug e10s for constant timeouts --- browser/modules/test/browser.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/modules/test/browser.ini b/browser/modules/test/browser.ini index 9211b25f6cc0..0f22e7a11670 100644 --- a/browser/modules/test/browser.ini +++ b/browser/modules/test/browser.ini @@ -7,7 +7,7 @@ support-files = [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] From f223579a3bb74a0105fa1de908995471e4ac80d1 Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Sun, 7 Aug 2016 15:40:06 -0700 Subject: [PATCH 3/7] Bug 1277107 - Skip browser_UITour_heartbeat.js on Windows where it fails constantly --- browser/components/uitour/test/browser.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/components/uitour/test/browser.ini b/browser/components/uitour/test/browser.ini index 0f29cc7d9ff4..fd1205d45d05 100644 --- a/browser/components/uitour/test/browser.ini +++ b/browser/components/uitour/test/browser.ini @@ -31,6 +31,7 @@ skip-if = os == "linux" # Linux: Bug 986760, Bug 989101. [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] From 1f8aef50d5cf531e5105d3bc5536c03b125f2181 Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Sun, 7 Aug 2016 15:44:52 -0700 Subject: [PATCH 4/7] Bug 1188154 - Skip browser_action_keyword.js on Linux where it times out constantly --- browser/base/content/test/urlbar/browser.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/base/content/test/urlbar/browser.ini b/browser/base/content/test/urlbar/browser.ini index a3d9ac7920d9..989f468c64ef 100644 --- a/browser/base/content/test/urlbar/browser.ini +++ b/browser/base/content/test/urlbar/browser.ini @@ -6,6 +6,7 @@ support-files = [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] From 4d9a7a0de9a1472e5530e941bcf4856a9f81e01d Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Sun, 7 Aug 2016 15:53:36 -0700 Subject: [PATCH 5/7] Bug 1289765 - Skip browser_locationBarCommand.js where it was still enabled for constant failures --- browser/base/content/test/urlbar/browser.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/base/content/test/urlbar/browser.ini b/browser/base/content/test/urlbar/browser.ini index 989f468c64ef..25e443d70f01 100644 --- a/browser/base/content/test/urlbar/browser.ini +++ b/browser/base/content/test/urlbar/browser.ini @@ -33,7 +33,7 @@ support-files = [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] From 8b44908586e5f90f5362590649b954689d110efd Mon Sep 17 00:00:00 2001 From: Tobias Schneider Date: Wed, 25 May 2016 08:00:32 -0700 Subject: [PATCH 6/7] Bug 1275591 - Enable plugin content blocking by default. r=bsmedberg --- modules/libpref/init/all.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 2195d50f1cc6..0a267d31cf5d 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -5138,7 +5138,7 @@ pref("browser.safebrowsing.reportPhishURL", "https://%LOCALE%.phish-report.mozil 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. From 0cb80d4c4706c26a2bcb9b1d550fc696d283048c Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Sun, 7 Aug 2016 23:06:50 -0700 Subject: [PATCH 7/7] Bug 1281360 - Skip test_popup_button.xul on ASan, where it mostly fails --- toolkit/content/tests/chrome/chrome.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/toolkit/content/tests/chrome/chrome.ini b/toolkit/content/tests/chrome/chrome.ini index d3a78dbbfbf3..661a3f7843f0 100644 --- a/toolkit/content/tests/chrome/chrome.ini +++ b/toolkit/content/tests/chrome/chrome.ini @@ -137,6 +137,7 @@ 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]