From 894124e3cf855409e8387726962b85869e831123 Mon Sep 17 00:00:00 2001
From: Christian Holler <choller@mozilla.com>
Date: Tue, 1 Dec 2020 20:21:20 +0000
Subject: [PATCH] Bug 1677049 - Skip problematic mochitest-bc tests in TSan.
 r=Gankro,preferences-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D98365
---
 browser/base/content/test/about/browser.ini                 | 4 +++-
 browser/base/content/test/metaTags/browser.ini              | 1 +
 browser/base/content/test/performance/io/browser.ini        | 2 +-
 browser/base/content/test/static/browser.ini                | 4 ++--
 browser/components/aboutconfig/test/browser/browser.ini     | 2 +-
 browser/components/aboutlogins/tests/browser/browser.ini    | 4 ++--
 browser/components/places/tests/browser/browser.ini         | 1 +
 browser/components/preferences/tests/browser.ini            | 5 +++--
 browser/components/sessionstore/test/browser.ini            | 3 ++-
 browser/components/urlbar/tests/browser/browser.ini         | 1 +
 devtools/client/aboutdebugging/test/browser/browser.ini     | 2 +-
 devtools/client/performance-new/test/browser/browser.ini    | 1 +
 dom/tests/browser/browser.ini                               | 2 +-
 toolkit/components/aboutprocesses/tests/browser/browser.ini | 2 +-
 toolkit/components/antitracking/test/browser/browser.ini    | 2 +-
 toolkit/components/passwordmgr/test/browser/browser.ini     | 2 +-
 toolkit/components/windowwatcher/test/browser.ini           | 2 +-
 toolkit/content/tests/browser/browser.ini                   | 1 +
 tools/profiler/tests/browser/browser.ini                    | 1 +
 widget/tests/browser/browser.ini                            | 2 +-
 20 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/browser/base/content/test/about/browser.ini b/browser/base/content/test/about/browser.ini
index 15567928c0ea..a5e904884320 100644
--- a/browser/base/content/test/about/browser.ini
+++ b/browser/base/content/test/about/browser.ini
@@ -35,10 +35,12 @@ support-files =
   xfo_iframe.sjs
 [browser_aboutNewTab_bookmarksToolbar.js]
 [browser_aboutNewTab_bookmarksToolbarEmpty.js]
+skip-if = tsan # Bug 1676326, highly frequent on TSan
 [browser_aboutNewTab_bookmarksToolbarNewWindow.js]
+skip-if = fission && tsan # Bug 1674948, perma on Fission+TSan
 [browser_aboutNewTab_bookmarksToolbarPrefs.js]
 [browser_aboutNewTab_defaultBrowserNotification.js]
-skip-if = debug || asan || ccov # Default browser checks are skipped on debug builds, bug 1660723
+skip-if = debug || asan || tsan || ccov # Default browser checks are skipped on debug builds, bug 1660723
 [browser_aboutStopReload.js]
 [browser_aboutSupport.js]
 [browser_aboutSupport_newtab_security_state.js]
diff --git a/browser/base/content/test/metaTags/browser.ini b/browser/base/content/test/metaTags/browser.ini
index 04d60805eb11..4468d331f0f1 100644
--- a/browser/base/content/test/metaTags/browser.ini
+++ b/browser/base/content/test/metaTags/browser.ini
@@ -5,4 +5,5 @@ support-files =
 [browser_bad_meta_tags.js]
 support-files = bad_meta_tags.html
 [browser_meta_tags.js]
+skip-if = tsan # Bug 1403403
 support-files = meta_tags.html
diff --git a/browser/base/content/test/performance/io/browser.ini b/browser/base/content/test/performance/io/browser.ini
index 39ccb944c9c6..44d850820bd9 100644
--- a/browser/base/content/test/performance/io/browser.ini
+++ b/browser/base/content/test/performance/io/browser.ini
@@ -3,7 +3,7 @@
 # Disabled on Linux asan due to bug 1549729.
 # Disabled on Windows Arm64 due to bug 1551493.
 # Disabled on Windows asan due to intermittent startup hangs, bug 1629824.
-skip-if = debug || (os == "linux" && asan) || (os == "win" && (asan || processor == "aarch64"))
+skip-if = debug || tsan || (os == "linux" && asan) || (os == "win" && (asan || processor == "aarch64"))
 # to avoid overhead when running the browser normally, startupRecorder.js will
 # do almost nothing unless browser.startup.record is true.
 # gfx.canvas.willReadFrequently.enable is just an optimization, but needs to be
diff --git a/browser/base/content/test/static/browser.ini b/browser/base/content/test/static/browser.ini
index b61c5ea5fca0..aed7b3c5fdfb 100644
--- a/browser/base/content/test/static/browser.ini
+++ b/browser/base/content/test/static/browser.ini
@@ -1,8 +1,8 @@
 [DEFAULT]
 # These tests can be prone to intermittent failures on slower systems.
 # Since the specific flavor doesn't matter from a correctness standpoint,
-# just skip the tests on ASAN and debug builds.
-skip-if = asan || debug
+# just skip the tests on sanitizer and debug builds.
+skip-if = asan || tsan || debug
 support-files =
   head.js
 
diff --git a/browser/components/aboutconfig/test/browser/browser.ini b/browser/components/aboutconfig/test/browser/browser.ini
index 5c19d4e2af95..a26dc43e584f 100644
--- a/browser/components/aboutconfig/test/browser/browser.ini
+++ b/browser/components/aboutconfig/test/browser/browser.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = debug || asan # Bug 1507747 and bug 1520398
+skip-if = debug || asan || tsan # Bug 1507747 and bug 1520398
 support-files =
   head.js
 
diff --git a/browser/components/aboutlogins/tests/browser/browser.ini b/browser/components/aboutlogins/tests/browser/browser.ini
index 384426526c21..3cef9684249c 100644
--- a/browser/components/aboutlogins/tests/browser/browser.ini
+++ b/browser/components/aboutlogins/tests/browser/browser.ini
@@ -10,7 +10,7 @@ prefs =
 # Run first so content events from previous tests won't trickle in.
 # Skip ASAN and debug since waiting for content events is already slow.
 [browser_aaa_eventTelemetry_run_first.js]
-skip-if = asan || ccov || debug || (os == "win" && !debug) # bug 1605494 is more prevalent on linux, Bug 1627419
+skip-if = asan || tsan || ccov || debug || (os == "win" && !debug) # bug 1605494 is more prevalent on linux, Bug 1627419
 [browser_alertDismissedAfterChangingPassword.js]
 [browser_breachAlertShowingForAddedLogin.js]
 [browser_confirmDeleteDialog.js]
@@ -39,7 +39,7 @@ skip-if = (os != "win" && os != "mac") # import is only available on Windows and
 skip-if = (os == 'linux') # bug 1527745
 [browser_removeAllDialog.js]
 [browser_sessionRestore.js]
-skip-if = debug # Bug 1576876
+skip-if = tsan || debug # Bug 1576876
 [browser_tabKeyNav.js]
 [browser_updateLogin.js]
 [browser_vulnerableLoginAddedInSecondaryWindow.js]
diff --git a/browser/components/places/tests/browser/browser.ini b/browser/components/places/tests/browser/browser.ini
index dfc2957827f7..d7da20fb8337 100644
--- a/browser/components/places/tests/browser/browser.ini
+++ b/browser/components/places/tests/browser/browser.ini
@@ -53,6 +53,7 @@ skip-if = (verify && debug)
 [browser_bookmarksProperties.js]
 skip-if = (verify && debug && (os == 'win' || os == 'mac'))
 [browser_check_correct_controllers.js]
+skip-if = tsan # Intermittently times out on TSan
 [browser_click_bookmarks_on_toolbar.js]
 [browser_controller_onDrop_query.js]
 [browser_controller_onDrop_sidebar.js]
diff --git a/browser/components/preferences/tests/browser.ini b/browser/components/preferences/tests/browser.ini
index 95b710bbd376..304275c69a1d 100644
--- a/browser/components/preferences/tests/browser.ini
+++ b/browser/components/preferences/tests/browser.ini
@@ -28,6 +28,7 @@ skip-if = (os == 'win' && (processor == "x86_64" || processor == "aarch64")) # B
 [browser_search_within_preferences_2.js]
 [browser_search_within_preferences_command.js]
 [browser_search_subdialogs_within_preferences_1.js]
+skip-if = tsan # Bug 1678829
 [browser_search_subdialogs_within_preferences_2.js]
 [browser_search_subdialogs_within_preferences_3.js]
 [browser_search_subdialogs_within_preferences_4.js]
@@ -68,10 +69,10 @@ skip-if = true || !healthreport # Bug 1185403 for the "true"
 [browser_homepage_default.js]
 [browser_https_only_section.js]
 [browser_extension_controlled.js]
-skip-if = ccov && (os == 'linux' || os == 'win') # Linux: bug 1613530, Windows: bug 1437051
+skip-if = tsan || ccov && (os == 'linux' || os == 'win') # Linux: bug 1613530, Windows: bug 1437051
 [browser_languages_subdialog.js]
 [browser_browser_languages_subdialog.js]
-skip-if = (!debug && os == 'win') # Bug 1518370
+skip-if = tsan || (!debug && os == 'win') # Bug 1518370
 [browser_layersacceleration.js]
 [browser_localSearchShortcuts.js]
 [browser_masterpassword.js]
diff --git a/browser/components/sessionstore/test/browser.ini b/browser/components/sessionstore/test/browser.ini
index 1f16482e70e8..acf6276963bb 100644
--- a/browser/components/sessionstore/test/browser.ini
+++ b/browser/components/sessionstore/test/browser.ini
@@ -127,6 +127,7 @@ skip-if = true # Bug 1646894
 skip-if = fission
 [browser_scrollPositionsReaderMode.js]
 [browser_sessionHistory.js]
+skip-if = tsan # Bug 1651907, highly frequent on TSan
 support-files =
   file_sessionHistory_hashchange.html
 [browser_sessionStorage.js]
@@ -140,7 +141,7 @@ skip-if = fission
 run-if = e10s
 skip-if = fission
 [browser_upgrade_backup.js]
-skip-if = debug || asan || (verify && debug && os == 'mac') # Bug 1435394 disabled on Linux, OSX and Windows
+skip-if = debug || asan || tsan || (verify && debug && os == 'mac') # Bug 1435394 disabled on Linux, OSX and Windows
 [browser_windowRestore_perwindowpb.js]
 [browser_248970_b_perwindowpb.js]
 # Disabled because of leaks.
diff --git a/browser/components/urlbar/tests/browser/browser.ini b/browser/components/urlbar/tests/browser/browser.ini
index fef686990bc6..251f7a6f8ba3 100644
--- a/browser/components/urlbar/tests/browser/browser.ini
+++ b/browser/components/urlbar/tests/browser/browser.ini
@@ -9,6 +9,7 @@ support-files =
   head-common.js
 
 [browser_aboutHomeLoading.js]
+skip-if = tsan # Intermittently times out, see 1622698 (frequent on TSan).
 [browser_action_searchengine.js]
 [browser_action_searchengine_alias.js]
 [browser_action_searchengine_alias_legacy.js]
diff --git a/devtools/client/aboutdebugging/test/browser/browser.ini b/devtools/client/aboutdebugging/test/browser/browser.ini
index bd865ac6f47b..1da038eb96aa 100644
--- a/devtools/client/aboutdebugging/test/browser/browser.ini
+++ b/devtools/client/aboutdebugging/test/browser/browser.ini
@@ -65,7 +65,7 @@ skip-if = (os == 'linux' && bits == 32) # ADB start() fails on linux 32, see Bug
 [browser_aboutdebugging_devtoolstoolbox_navigate_reload_button.js]
 [browser_aboutdebugging_devtoolstoolbox_navigate_to_url.js]
 [browser_aboutdebugging_devtoolstoolbox_performance.js]
-skip-if = os == 'linux' && e10s && (asan || debug) # Same skip-if as old perf panel test suite. Bug 1254821
+skip-if = os == 'linux' && e10s && (asan || tsan || debug) # Same skip-if as old perf panel test suite. Bug 1254821
 [browser_aboutdebugging_devtoolstoolbox_reload.js]
 skip-if = verify || ccov || (os == 'linux' && debug) #bug 1544828, test loads the toolbox 2 times for each panel, might timeout or OOM
 [browser_aboutdebugging_devtoolstoolbox_shortcuts.js]
diff --git a/devtools/client/performance-new/test/browser/browser.ini b/devtools/client/performance-new/test/browser/browser.ini
index bd0ffc1ff8f8..98f5ffd3e8ed 100644
--- a/devtools/client/performance-new/test/browser/browser.ini
+++ b/devtools/client/performance-new/test/browser/browser.ini
@@ -13,6 +13,7 @@ support-files =
 [browser_aboutprofiling-entries.js]
 [browser_aboutprofiling-features-disabled.js]
 [browser_aboutprofiling-features.js]
+skip-if = tsan # Frequently times out on TSan
 [browser_aboutprofiling-interval.js]
 [browser_aboutprofiling-threads.js]
 [browser_aboutprofiling-threads-behavior.js]
diff --git a/dom/tests/browser/browser.ini b/dom/tests/browser/browser.ini
index 026c769abfd8..52123c78ee86 100644
--- a/dom/tests/browser/browser.ini
+++ b/dom/tests/browser/browser.ini
@@ -61,7 +61,7 @@ skip-if = fission || !e10s || os != "win" || processor != "x86" # Large-Allocati
 skip-if = fission || !e10s || (os == "win" && processor == "x86") # Large-Allocation requires non-fission e10s
 [browser_localStorage_e10s.js]
 fail-if = fission
-skip-if = !e10s || verify # This is a test of e10s functionality.
+skip-if = !e10s || verify || tsan # This is a test of e10s functionality. Times out on TSan intermittently.
 [browser_localStorage_privatestorageevent.js]
 [browser_localStorage_snapshotting_e10s.js]
 fail-if = fission
diff --git a/toolkit/components/aboutprocesses/tests/browser/browser.ini b/toolkit/components/aboutprocesses/tests/browser/browser.ini
index 8ab76fbb24c4..d66c1965327c 100644
--- a/toolkit/components/aboutprocesses/tests/browser/browser.ini
+++ b/toolkit/components/aboutprocesses/tests/browser/browser.ini
@@ -1,6 +1,6 @@
 [default]
 head = head.js
-skip-if = asan # With ASAN, we regularly hit internal timeouts.
+skip-if = asan || tsan # With sanitizers, we regularly hit internal timeouts.
 
 [browser_aboutprocesses_default_options.js]
 [browser_aboutprocesses_show_all_frames.js]
diff --git a/toolkit/components/antitracking/test/browser/browser.ini b/toolkit/components/antitracking/test/browser/browser.ini
index 8587afce3ce5..a433c55738e9 100644
--- a/toolkit/components/antitracking/test/browser/browser.ini
+++ b/toolkit/components/antitracking/test/browser/browser.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = os == "linux" && asan # bug 1662229 - task exception
+skip-if = os == "linux" && (asan || tsan) # bug 1662229 - task exception
 prefs =
   # Disable the Storage Access API prompts for all of the tests in this directory
   dom.storage_access.prompt.testing=true
diff --git a/toolkit/components/passwordmgr/test/browser/browser.ini b/toolkit/components/passwordmgr/test/browser/browser.ini
index 2e923b53a4e6..51d8d48316e5 100644
--- a/toolkit/components/passwordmgr/test/browser/browser.ini
+++ b/toolkit/components/passwordmgr/test/browser/browser.ini
@@ -84,7 +84,7 @@ support-files =
   subtst_notifications_change_p.html
 [browser_doorhanger_save_password.js]
 [browser_doorhanger_submit_telemetry.js]
-skip-if = os == "linux" && debug # Bug 1658056
+skip-if = tsan || os == "linux" && debug # Bug 1658056, tsan: bug 1661305
 [browser_doorhanger_target_blank.js]
 support-files =
   subtst_notifications_12_target_blank.html
diff --git a/toolkit/components/windowwatcher/test/browser.ini b/toolkit/components/windowwatcher/test/browser.ini
index a77ae1cf20fe..bca55762c48f 100644
--- a/toolkit/components/windowwatcher/test/browser.ini
+++ b/toolkit/components/windowwatcher/test/browser.ini
@@ -10,5 +10,5 @@ run-if = e10s
 [browser_new_sized_window.js]
 skip-if = os == 'win' # Bug 1276802 - Opening windows from content on Windows might not get the size right
 [browser_popup_condition.js]
-skip-if = debug # Opening many windows takes long on debug build
+skip-if = tsan || debug # Opening many windows takes long on slow build
 [browser_non_popup_from_popup.js]
diff --git a/toolkit/content/tests/browser/browser.ini b/toolkit/content/tests/browser/browser.ini
index 20feb19abb54..c1d047850cdc 100644
--- a/toolkit/content/tests/browser/browser.ini
+++ b/toolkit/content/tests/browser/browser.ini
@@ -64,6 +64,7 @@ skip-if = !e10s || !crashreporter
 [browser_crash_previous_frameloader.js]
 run-if = e10s && crashreporter
 [browser_datetime_datepicker.js]
+skip-if = tsan # Frequently times out on TSan
 [browser_default_image_filename.js]
 [browser_default_image_filename_redirect.js]
 support-files =
diff --git a/tools/profiler/tests/browser/browser.ini b/tools/profiler/tests/browser/browser.ini
index 3c59197c22e9..afbccd1b006b 100644
--- a/tools/profiler/tests/browser/browser.ini
+++ b/tools/profiler/tests/browser/browser.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = tsan # TSan times out on pretty much all of these tests
 support-files =
   ../shared-head.js
   head.js
diff --git a/widget/tests/browser/browser.ini b/widget/tests/browser/browser.ini
index bb8e53682aaf..a50eec47e774 100644
--- a/widget/tests/browser/browser.ini
+++ b/widget/tests/browser/browser.ini
@@ -1,2 +1,2 @@
 [browser_test_clipboardcache.js]
-skip-if = os == 'android' || (os == 'linux' && ccov) # Bug 1613516, the test consistently timeouts on Linux coverage builds.
+skip-if = os == 'android' || (os == 'linux' && ccov) || tsan # Bug 1613516, the test consistently timeouts on Linux coverage builds.