Backed out changeset 4099afcff2be (bug 1881925) for causing gecko decision task failures in browser.toml CLOSED TREE

browser/base/content/test/about/browser.toml

@@ -34,8 +34,7 @@ support-files = [
 ["browser_aboutHome_search_suggestion.js"]
 skip-if = [
   "os == 'mac'",
-  "os == 'linux' && os_version == '18.04' && !debug",
-  "os == 'linux' && os_version == '18.04' && bits == 64",
+  "os == 'linux' && (!debug || bits == 64)",
   "win10_2009 && bits == 64 && !debug", # Bug 1399648, bug 1402502
 ]
 
@@ -76,7 +75,7 @@ skip-if = ["tsan"] # Bug 1676326, highly frequent on TSan
 ["browser_aboutStopReload.js"]
 
 ["browser_aboutSupport.js"]
-skip-if = ["os == 'linux' && os_version == '18.04' && asan"] # Bug 1713368
+skip-if = ["os == 'linux' && bits == 64 && asan && !debug"] # Bug 1713368
 
 ["browser_aboutSupport_newtab_security_state.js"]
 
@@ -84,9 +83,6 @@ skip-if = ["os == 'linux' && os_version == '18.04' && asan"] # Bug 1713368
 skip-if = ["os == 'android'"]
 
 ["browser_bug435325.js"]
-skip-if = [
-  "apple_catalina && !debug && verify"
-  "apple_silicon && !debug && verify"
-]
+skip-if = ["verify && !debug && os == 'mac'"]
 
 ["browser_bug633691.js"]

browser/components/extensions/test/browser/browser.toml

@@ -49,7 +49,7 @@ support-files = [
   "../../../../../toolkit/components/reader/test/readerModeNonArticle.html",
   "../../../../../toolkit/components/reader/test/readerModeArticle.html",
 ]
-skip-if = ["os == 'linux' && os_version == '18.04' && asan"] # Bug 1721945 - Software WebRender
+skip-if = ["os == 'linux' && asan"] # Bug 1721945 - Software WebRender
 
 ["browser_AMBrowserExtensionsImport.js"]
 
@@ -75,12 +75,12 @@ disabled = "bug 1438663 # same focus issue as Bug 1438663"
 ["browser_ext_browserAction_context.js"]
 https_first_disabled = true
 skip-if = [
-  "os == 'linux' && os_version == '18.04' && debug", # Bug 1504096
-  "os == 'linux' && os_version == '18.04' && socketprocess_networking",
+  "os == 'linux' && debug", # Bug 1504096
+  "os == 'linux' && socketprocess_networking",
 ]
 
 ["browser_ext_browserAction_contextMenu.js"]
-skip-if = ["os == 'linux' && os_version == '18.04'"] # bug 1369197
+skip-if = ["os == 'linux'"] # bug 1369197
 
 ["browser_ext_browserAction_disabled.js"]
 
@@ -132,9 +132,8 @@ skip-if = ["debug"] # Bug 1522164
 
 ["browser_ext_commands_execute_page_action.js"]
 skip-if = [
-  "os == 'linux' && os_version == '18.04' && verify",
-  "apple_catalina && verify",
-  "apple_silicon && verify",
+  "verify && os == 'linux'",
+  "verify && os == 'mac'",
 ]
 
 ["browser_ext_commands_execute_sidebar_action.js"]
@@ -231,9 +230,8 @@ support-files = ["../../../../../devtools/client/inspector/extensions/test/head_
 ["browser_ext_find.js"]
 https_first_disabled = true
 skip-if = [
-  "os == 'linux' && os_version == '18.04' && verify",
-  "apple_catalina && verify",
-  "apple_silicon && verify",
+  "verify && os == 'linux'",
+  "verify && os == 'mac'",
 ]
 
 ["browser_ext_getViews.js"]
@@ -305,9 +303,8 @@ https_first_disabled = true
 
 ["browser_ext_openPanel.js"]
 skip-if = [
-  "os == 'linux' && os_version == '18.04' && !debug && verify",
-  "apple_catalina && !debug && verify",
-  "apple_silicon && !debug && verify",
+  "verify && !debug && os == 'linux'",
+  "verify && !debug && os == 'mac'",
 ]
 
 ["browser_ext_optionsPage_activity.js"]
@@ -331,17 +328,14 @@ https_first_disabled = true
 
 ["browser_ext_pageAction_context.js"]
 https_first_disabled = true
-skip-if = ["os == 'linux' && os_version == '18.04' && !debug && verify"]
+skip-if = ["verify && !debug && os == 'linux'"]
 
 ["browser_ext_pageAction_contextMenu.js"]
 
 ["browser_ext_pageAction_popup.js"]
 
 ["browser_ext_pageAction_popup_resize.js"]
-skip-if = [
-  "apple_catalina && debug && verify",
-  "apple_silicon && debug && verify",
-]
+skip-if = ["verify && debug && os == 'mac'"]
 
 ["browser_ext_pageAction_show_matches.js"]
 https_first_disabled = true
@@ -493,9 +487,8 @@ https_first_disabled = true
 ["browser_ext_tabs_discard_reversed.js"]
 https_first_disabled = true
 skip-if = [
-  "apple_silicon", # Bug 1722607
-  "apple_catalina", # Bug 1722607
-  "os == 'linux' && os_version == '18.04' && debug", #Bug 1722607
+  "os == 'mac'", # Bug 1722607
+  "os == 'linux' && debug", #Bug 1722607
 ]
 
 ["browser_ext_tabs_discarded.js"]
@@ -648,10 +641,7 @@ https_first_disabled = true
 ["browser_ext_webRequest_error_after_stopped_or_closed.js"]
 
 ["browser_ext_webrtc.js"]
-skip-if = [
-  "apple_catalina", # Bug 1565738
-  "apple_silicon", # Bug 1565738
-]
+skip-if = ["os == 'mac'"] # Bug 1565738
 
 ["browser_ext_windows.js"]
 https_first_disabled = true
@@ -660,10 +650,7 @@ https_first_disabled = true
 https_first_disabled = true
 
 ["browser_ext_windows_create.js"]
-skip-if = [
-  "apple_catalina && verify",
-  "apple_silicon && verify",
-]
+skip-if = ["verify && os == 'mac'"]
 tags = "fullscreen"
 
 ["browser_ext_windows_create_cookieStoreId.js"]
@@ -683,15 +670,13 @@ https_first_disabled = true
 
 ["browser_ext_windows_size.js"]
 skip-if = [
-  "apple_catalina",
-  "apple_silicon",
+  "os == 'mac'",
   "os == 'linux' && os_version == '18.04' && debug", # Fails when windows are randomly opened in fullscreen mode, Bug 1638027
 ]
 
 ["browser_ext_windows_update.js"]
 skip-if = [
-  "apple_catalina && verify",
-  "apple_silicon && verify",
+  "verify && os == 'mac'",
   "os == 'mac' && os_version == '10.15' && debug", # Bug 1780998
   "os == 'linux' && os_version == '18.04'", # Bug 1533982 for linux1804
 ]

browser/components/uitour/test/browser.toml

@@ -9,7 +9,7 @@ support-files = [
 
 ["browser_UITour.js"]
 skip-if = [
-  "os == 'linux' && os_version == '18.04'", # Intermittent failures, bug 951965
+  "os == 'linux'", # Intermittent failures, bug 951965
   "verify",
 ]
 
@@ -35,7 +35,7 @@ fail-if = ["a11y_checks"] # Bug 1854526 clicked UITourTooltipClose may not be fo
 ["browser_UITour_forceReaderMode.js"]
 
 ["browser_UITour_modalDialog.js"]
-run-if = ["os == 'mac'"] # modal dialog disabling only working on OS X.
+skip-if = ["os != 'mac'"] # modal dialog disabling only working on OS X.
 
 ["browser_UITour_observe.js"]
 
@@ -48,30 +48,26 @@ skip-if = ["true"] # Disabled pending removal of pocket UI Tour
 ["browser_UITour_private_browsing.js"]
 
 ["browser_UITour_resetProfile.js"]
-skip-if = ["os == 'linux' && os_version == '18.04' && !debug && verify"]
+skip-if = ["verify && !debug && (os == 'linux')"]
 
 ["browser_UITour_showNewTab.js"]
-skip-if = ["os == 'linux' && os_version == '18.04' && !debug && verify"]
+skip-if = ["verify && !debug && (os == 'linux')"]
 
 ["browser_UITour_showProtectionReport.js"]
-skip-if = [
-  "os == 'linux' && os_version == '18.04' && asan", # Bug 1697217
-  "os == 'linux' && os_version == '18.04' && debug", # Bug 1697217
-  "os == 'linux' && os_version == '18.04' && tsan", # Bug 1697217
-]
+skip-if = ["os == 'linux' && (asan || debug || tsan)"] # Bug 1697217
 
 ["browser_UITour_sync.js"]
 skip-if = [
-  "os == 'linux' && os_version == '18.04'", # Bug 1678417
+  "os == 'linux'", # Bug 1678417
 ]
 
 ["browser_UITour_toggleReaderMode.js"]
-skip-if = ["os == 'linux' && os_version == '18.04' && !debug && verify"]
+skip-if = ["verify && !debug && (os == 'linux')"]
 
 ["browser_backgroundTab.js"]
 
 ["browser_closeTab.js"]
-skip-if = ["os == 'linux' && os_version == '18.04' && !debug && verify"]
+skip-if = ["verify && !debug && (os == 'linux')"]
 
 ["browser_fxa.js"]
 

browser/extensions/formautofill/test/browser/creditCard/browser.toml

@@ -17,10 +17,7 @@ support-files = [
 ]
 
 ["browser_anti_clickjacking.js"]
-skip-if = [
-  "apple_catalina && !debug", # perma-fail see Bug 1600059
-  "apple_silicon && !debug", # perma-fail see Bug 1600059
-]
+skip-if = ["!debug && os == 'mac'"] # perma-fail see Bug 1600059
 
 ["browser_creditCard_capture_form_removal.js"]
 
@@ -28,62 +25,58 @@ skip-if = [
 
 ["browser_creditCard_doorhanger_action.js"]
 skip-if = [
-  "apple_catalina && !debug", # perma-fail see Bug 1655601
-  "apple_silicon && !debug", # perma-fail see Bug 1655601
-  "win11_2009 && ccov",   # Bug 1655600
+  "!debug && os == 'mac'", # perma-fail see Bug 1655601
+  "os == 'win' && ccov",   # Bug 1655600
 ]
 
 ["browser_creditCard_doorhanger_display.js"]
 skip-if = [
-  "apple_catalina && !debug", # perma-fail see Bug 1655601
-  "apple_silicon && !debug", # perma-fail see Bug 1655601
-  "win11_2009 && ccov",   # Bug 1655600
+  "!debug && os == 'mac'", # perma-fail see Bug 1655601
+  "os == 'win' && ccov",   # Bug 1655600
 ]
 
 ["browser_creditCard_doorhanger_fields.js"]
 skip-if = [
-  "apple_catalina && !debug", # perma-fail see Bug 1655601
-  "apple_silicon && !debug", # perma-fail see Bug 1655601
-  "win11_2009 && ccov",   # Bug 1655600
+  "!debug && os == 'mac'", # perma-fail see Bug 1655601
+  "os == 'win' && ccov",   # Bug 1655600
 ]
 
 ["browser_creditCard_doorhanger_iframe.js"]
 skip-if = [
-  "apple_catalina && !debug", # perma-fail see Bug 1655601
-  "apple_silicon && !debug", # perma-fail see Bug 1655601
-  "win11_2009 && ccov",   # Bug 1655600
+  "!debug && os == 'mac'", # perma-fail see Bug 1655601
+  "os == 'win' && ccov",   # Bug 1655600
 ]
 
 ["browser_creditCard_doorhanger_logo.js"]
 skip-if = [
-  "apple_catalina && !debug", # perma-fail see Bug 1655601
-  "apple_silicon && !debug", # perma-fail see Bug 1655601
-  "win11_2009 && ccov",   # Bug 1655600
+  "!debug && os == 'mac'", # perma-fail see Bug 1655601
+  "os == 'win' && ccov",   # Bug 1655600
 ]
 
 ["browser_creditCard_doorhanger_not_shown.js"]
 skip-if = [
-  "apple_catalina && !debug", # perma-fail see Bug 1655601
-  "apple_silicon && !debug", # perma-fail see Bug 1655601
-  "win11_2009 && ccov",   # Bug 1655600
+  "!debug && os == 'mac'", # perma-fail see Bug 1655601
+  "os == 'win' && ccov",   # Bug 1655600
 ]
 
 ["browser_creditCard_doorhanger_sync.js"]
 skip-if = [
-  "apple_catalina && !debug", # perma-fail see Bug 1655601
-  "apple_silicon && !debug", # perma-fail see Bug 1655601
-  "win11_2009 && ccov",   # Bug 1655600
+  "!debug && os == 'mac'", # perma-fail see Bug 1655601
+  "os == 'win' && ccov",   # Bug 1655600
 ]
 
 ["browser_creditCard_dropdown_layout.js"]
-skip-if = ["true"]
+skip-if = [
+  "os == 'mac'",
+  "os == 'linux'",
+  "os == 'win'",
+]
 
 ["browser_creditCard_fill_cancel_login.js"]
 skip-if = [
-  "apple_catalina && !debug",
-  "os == 'linux' && os_version == '18.04'",
-  "win10_2009",
-  "win11_2009",
+  "!debug && os == 'mac'",
+  "os == 'linux'",
+  "os == 'win'",
 ]
 
 ["browser_creditCard_heuristics.js"]
@@ -107,10 +100,22 @@ skip-if = [
 ]
 
 ["browser_editCreditCardDialog.js"]
-skip-if = ["true"] # perma-fail see Bug 1600059
+skip-if = [
+  "os == 'mac'",   # perma-fail see Bug 1600059
+  "os == 'linux'", # perma-fail see Bug 1600059
+  "os == 'win'",   # perma-fail see Bug 1600059
+]
 
 ["browser_insecure_form.js"]
-skip-if = ["true"] # perma-fail see Bug 1456284
+skip-if = [
+  "os == 'mac'",   # bug 1456284
+  "os == 'linux'", # bug 1456284
+  "os == 'win'",   # bug 1456284
+]
 
 ["browser_manageCreditCardsDialog.js"]
-skip-if = ["true"]
+skip-if = [
+  "os == 'mac'",
+  "os == 'linux'",
+  "os == 'win'",
+]

devtools/client/inspector/computed/test/browser.toml

@@ -34,8 +34,7 @@ fail-if = ["a11y_checks"] # Bug 1849028 clicked element may not be focusable and
 
 ["browser_computed_getNodeInfo.js"]
 skip-if = [
-  "apple_catalina && !debug", #Bug 1559033
-  "apple_silicon && !debug", #Bug 1559033
+  "!debug && os == 'mac'", #Bug 1559033
   "a11y_checks", # Bugs 1849028 and 1858041 to investigate intermittent a11y_checks results
 ]
 

devtools/client/netmonitor/src/har/test/browser.toml

@@ -21,9 +21,8 @@ support-files = [
 
 ["browser_net_har_copy_all_as_har.js"]
 skip-if = [
-  "apple_catalina && !debug", #Bug 1622925
-  "apple_silicon && !debug", #Bug 1622925
-  "os == 'linux' && os_version == '18.04' && !debug", #Bug 1622925
+  "!debug && os == 'mac'", #Bug 1622925
+  "!debug && os == 'linux'", #Bug 1622925
   "win11_2009", # Bug 1797751
 ]
 

devtools/client/netmonitor/test/browser.toml

@@ -124,11 +124,9 @@ fail-if = ["a11y_checks"] # Bug 1849028 clicked element may not be focusable and
 
 ["browser_net_block-pattern.js"]
 skip-if = [
-  "os == 'linux' && os_version == '18.04'",
-  "win11_2009 && debug", # Bug 1603355
-  "win10_2009 && debug", # Bug 1603355
-  "apple_catalina && debug", # Bug 1603355
-  "apple_silicon && debug", # Bug 1603355
+  "os == 'linux'",
+  "debug && os == 'win'", # Bug 1603355
+  "debug && os == 'mac'", # Bug 1603355
 ]
 
 ["browser_net_block-serviceworker.js"]
@@ -186,17 +184,15 @@ skip-if = [
 
 ["browser_net_complex-params.js"]
 skip-if = [
+  "verify && !debug && os == 'win'",
   "win11_2009", # Bug 1797751
 ]
 
 ["browser_net_content-type.js"]
-skip-if = [
-  "apple_catalina && !debug",
-  "apple_silicon && !debug",
-]
+skip-if = ["!debug && os == 'mac'"]
 
 ["browser_net_cookies_sorted.js"]
-skip-if = ["win11_2009 && debug && verify"]
+skip-if = ["verify && debug && os == 'win'"]
 
 ["browser_net_copy_as_curl.js"]
 
@@ -211,8 +207,7 @@ skip-if = ["win11_2009 && debug && verify"]
 ["browser_net_copy_params.js"]
 skip-if = [
   "win11_2009", # Bug 1797751
-  "apple_catalina && !debug && verify", # bug 1328915
-  "apple_silicon && !debug && verify", # bug 1328915
+  "verify && !debug && os == 'mac'", # bug 1328915, disable linux32 debug devtools for timeouts
 ]
 
 ["browser_net_copy_response.js"]
@@ -366,7 +361,7 @@ skip-if = ["!fission"]
 ["browser_net_params_sorted.js"]
 
 ["browser_net_pause.js"]
-skip-if = ["win11_2009 && debug && verify"]
+skip-if = ["verify && debug && os == 'win'"]
 
 ["browser_net_persistent_logs.js"]
 skip-if = ["true"] #Bug 1661612
@@ -382,10 +377,7 @@ skip-if = ["true"] #Bug 1661612
 ["browser_net_prefs-and-l10n.js"]
 
 ["browser_net_prefs-reload.js"]
-skip-if = [
-  "win10_2009", # bug 1391264
-  "win11_2009", # bug 1391264
-]
+skip-if = ["os == 'win'"] # bug 1391264
 
 ["browser_net_raw_headers.js"]
 
@@ -406,7 +398,7 @@ skip-if = [
 ["browser_net_resend_xhr.js"]
 
 ["browser_net_response_CORS_blocked.js"]
-skip-if = ["os == 'linux' && os_version == '18.04' && !debug && a11y_checks"] # bug 1732635
+skip-if = ["a11y_checks && os == 'linux' && !debug"] # bug 1732635
 
 ["browser_net_response_node-expanded.js"]
 fail-if = ["a11y_checks"] # Bug 1849028 clicked element may not be focusable and/or labeled
@@ -414,7 +406,7 @@ fail-if = ["a11y_checks"] # Bug 1849028 clicked element may not be focusable and
 ["browser_net_save_response_as.js"]
 
 ["browser_net_search-results.js"]
-skip-if = ["os == 'linux' && os_version == '18.04' && a11y_checks"]  # Bug 1721160
+skip-if = ["os == 'linux' && a11y_checks"]  # Bug 1721160
 
 ["browser_net_security-details.js"]
 
@@ -441,7 +433,7 @@ fail-if = ["a11y_checks"] # Bug 1849028 clicked element may not be focusable and
 fail-if = ["a11y_checks"] # Bug 1849028 clicked element may not be focusable and/or labeled
 
 ["browser_net_service-worker-status.js"]
-skip-if = ["os == 'linux' && os_version == '18.04' && !debug && verify"]
+skip-if = ["verify && !debug && os == 'linux'"]
 
 ["browser_net_service-worker-timings.js"]
 fail-if = ["a11y_checks"] # Bug 1849028 clicked element may not be focusable and/or labeled

docshell/test/navigation/mochitest.toml

@@ -132,10 +132,7 @@ skip-if = ["os == 'android'"]
 
 ["test_bug430723.html"]
 skip-if = [
-  "win10_2009 && !debug", # Bug 874423
-  "win11_2009 && !debug", # Bug 874423
-  "apple_silicon && !debug", # Bug 874423
-  "apple_catalina && !debug", # Bug 874423
+  "!debug && (os == 'mac' || os == 'win')", # Bug 874423
   "http3",
   "http2",
 ]
@@ -287,7 +284,7 @@ support-files = ["file_same_url.html"]
 ["test_session_history_on_redirect.html"]
 
 ["test_sessionhistory.html"]
-skip-if = ["os == 'mac' && debug && verify"] # Hit MOZ_CRASH(Shutdown too long, probably frozen, causing a crash.) bug 1677545
+skip-if = ["verify && os == 'mac' && debug"] # Hit MOZ_CRASH(Shutdown too long, probably frozen, causing a crash.) bug 1677545
 
 ["test_sessionhistory_document_write.html"]
 

dom/html/test/mochitest.toml

@@ -190,13 +190,10 @@ support-files = [
 
 ["test_allowMedia.html"]
 skip-if = [
-  "apple_catalina && !debug",
-  "apple_silicon && !debug",
-  "os == 'linux' && os_version == '18.04' && verify",
-  "os == 'linux' && os_version == '18.04' && debug", #Bug 1434744
-  "win11_2009 && verify",
-  "win10_2009 && debug",
-  "win11_2009 && debug",
+  "verify && (os == 'linux' || os == 'win')",
+  "!debug && os == 'mac' && bits == 64",
+  "debug && os == 'win'",
+  "debug && os == 'linux' && os_version == '18.04'", #Bug 1434744
 ]
 
 ["test_anchor_href_cache_invalidation.html"]
@@ -327,7 +324,7 @@ skip-if = ["os == 'android'"] #TIMED_OUT
 ["test_bug369370.html"]
 skip-if = [
   "os == 'android'",
-  "os == 'linux' && os_version == '18.04'", # disabled on linux bug 1258103
+  "os == 'linux'", # disabled on linux bug 1258103
 ]
 
 ["test_bug371375.html"]
@@ -600,8 +597,7 @@ fail-if = ["xorigin"]
 ["test_bug615833.html"]
 skip-if = [
   "os == 'android'",
-  "apple_catalina", #TIMED_OUT # form control not selected/checked with synthesizeMouse, osx(bug 1275664)
-  "apple_silicon", #TIMED_OUT # form control not selected/checked with synthesizeMouse, osx(bug 1275664)
+  "os == 'mac'", #TIMED_OUT # form control not selected/checked with synthesizeMouse, osx(bug 1275664)
 ]
 
 ["test_bug618948.html"]
@@ -773,22 +769,17 @@ skip-if = [
 ["test_bug1261673.html"]
 skip-if = [
   "os == 'android'",
-  "apple_catalina",
-  "apple_silicon",
+  "os == 'mac'",
 ]
 
 ["test_bug1261674-1.html"]
 skip-if = [
   "os == 'android'",
-  "apple_catalina",
-  "apple_silicon",
+  "os == 'mac'",
 ]
 
 ["test_bug1261674-2.html"]
-skip-if = [
-  "apple_catalina",
-  "apple_silicon",
-]
+skip-if = ["os == 'mac'"]
 
 ["test_bug1264157.html"]
 
@@ -988,8 +979,7 @@ tags = "openwindow"
 skip-if = [
   "os == 'android' && debug",
   "os == 'linux'",
-  "win11_2009 && bits == 64 && debug", # Bug 1533759
-  "win10_2009 && bits == 64 && debug", # Bug 1533759
+  "os == 'win' && debug && bits == 64", # Bug 1533759
 ]
 
 ["test_window_open_from_closing.html"]

dom/indexedDB/test/mochitest-common.toml

@@ -282,7 +282,7 @@ skip-if = ["true"] # disabled for the moment
 ["test_names_sorted.html"]
 skip-if = [
   "xorigin && !debug", # Hangs
-  "os == 'linux' && os_version == '18.04' && bits == 64 && !debug", # Bug 1602927
+  "os == 'linux' && bits == 64 && !debug", # Bug 1602927
 ]
 
 ["test_objectCursors.html"]
@@ -382,9 +382,7 @@ skip-if = [
 
 ["test_upgrade_add_index.html"]
 skip-if = [
-  "os == 'linux' && os_version == '18.04' && bits == 64 && !debug",
-  "apple_silicon && !debug",
-  "apple_catalina && !debug",
+  "!debug && bits == 64 && (os == 'linux' || os == 'mac')",
   "os == 'win'", #Bug 1637715
 ]
 scheme = "https"

dom/ipc/tests/JSWindowActor/browser.toml

@@ -6,10 +6,7 @@ support-files = ["head.js"]
 ["browser_crash_report.js"]
 
 ["browser_destroy_callbacks.js"]
-skip-if = [
-  "apple_catalina && !debug", #Bug 1604538
-  "apple_silicon && !debug", #Bug 1604538
-]
+skip-if = ["!debug && os == 'mac'"] #Bug 1604538
 
 ["browser_event_listener.js"]
 support-files = ["file_dummyChromePage.html"]

dom/tests/mochitest/general/mochitest.toml

@@ -194,7 +194,7 @@ skip-if = [
 ["test_resizeby.html"]
 skip-if = [
   "os == 'android'", # Window sizes cannot be controled on android; Windows
-  "os == 'linux' && os_version == '18.04' && bits == 64",# Bug 1604152
+  "os == 'linux' && bits == 64",# Bug 1604152
 ]
 
 ["test_resource_timing.html"]
@@ -261,10 +261,8 @@ skip-if = [
 
 ["test_toggling_performance_navigation_timing.html"]
 skip-if = [
-  "win10_2009 && bits == 64 && !debug", # Bug 1730152
-  "win11_2009 && bits == 64 && !debug", # Bug 1730152
-  "apple_catalina && !debug", # Bug 1730152
-  "apple_silicon && !debug", # Bug 1730152
+  "os == 'win' && bits == 64 && !debug", # Bug 1730152
+  "os == 'mac' && bits == 64 && !debug", # Bug 1730152
 ]
 
 ["test_vibrator.html"]

toolkit/components/antitracking/test/xpcshell/xpcshell.toml

@@ -26,11 +26,10 @@ skip-if = ["socketprocess_networking"] # Bug 1759035
 ["test_staticPartition_font.js"]
 support-files = ["data/font.woff"]
 skip-if = [
-  "os == 'linux' && os_version == '18.04' && !debug", # Bug 1760086
+  "os == 'linux' && !debug", # Bug 1760086
   "apple_silicon", # bug 1729551
-  "apple_catalina && !debug", # Bug 1652119
-  "win10_2009 && bits == 64 && !debug", # Bug 1652119
-  "win11_2009 && bits == 64 && !debug", # Bug 1652119
+  "os == 'mac' && bits == 64 && !debug", # Bug 1652119
+  "os == 'win' && bits == 64 && !debug", # Bug 1652119
   "socketprocess_networking", # Bug 1759035
 ]
 run-sequentially = "very high failure rate in parallel"

toolkit/components/passwordmgr/test/browser/browser.toml

@@ -36,9 +36,8 @@ support-files = [
 
 ["browser_DOMInputPasswordAdded.js"]
 skip-if = [
-  "os == 'linux' && os_version == '18.04'", # Bug 1337606
-  "apple_catalina", # Bug 1337606
-  "apple_silicon", # Bug 1337606
+  "os == 'linux'", # Bug 1337606
+  "os == 'mac'", # Bug 1337606
 ]
 
 ["browser_autocomplete_autofocus_with_frame.js"]
@@ -48,17 +47,15 @@ support-files = ["form_autofocus_frame.html"]
 support-files = ["form_disabled_readonly_passwordField.html"]
 
 ["browser_autocomplete_footer.js"]
-skip-if = ["os == 'linux' && os_version == '18.04' && bits == 64 && !debug"] # Bug 1591126
+skip-if = ["!debug && os == 'linux' && bits == 64 && os_version == '18.04'"] # Bug 1591126
 
 ["browser_autocomplete_generated_password_private_window.js"]
 
 ["browser_autocomplete_import.js"]
 https_first_disabled = true
 skip-if = [
-  "apple_catalina", # Bug 1775902
-  "apple_silicon", # Bug 1775902
-  "win10_2009 && !debug", # Bug 1775902
-  "win11_2009 && !debug", # Bug 1775902
+  "os == 'mac'", # Bug 1775902
+  "os == 'win' && !debug", # Bug 1775902
 ]
 
 ["browser_autocomplete_insecure_warning.js"]
@@ -67,7 +64,8 @@ skip-if = [
 
 ["browser_autofill_hidden_document.js"]
 skip-if = [
-  "apple_catalina && !debug", # high frequency intermittent, Bug 1716486
+  "os == 'win' && os_version == '10.0' && debug", # bug 1530935
+  "apple_catalina && fission && !debug", # high frequency intermittent, Bug 1716486
 ]
 
 ["browser_autofill_http.js"]
@@ -83,10 +81,7 @@ skip-if = ["os == 'android'"]
 ["browser_basicAuth_rateLimit.js"]
 
 ["browser_basicAuth_switchTab.js"]
-skip-if = [
-  "apple_catalina && debug", # Bug 1530566
-  "apple_silicon && debug", # Bug 1530566
-]
+skip-if = ["debug && os == 'mac'"] # Bug 1530566
 
 ["browser_context_menu.js"]
 
@@ -126,10 +121,9 @@ support-files = [
   "form_password_change.html",
 ]
 skip-if = [
-  "os == 'linux' && os_version == '18.04'", # Bug 1729196
+  "os == 'linux'", # Bug 1729196
   "win11_2009 && bits == 64", # Bug 1729196
-  "apple_catalina && debug", # Bug 1729196
-  "apple_silicon && debug", # Bug 1729196
+  "os == 'mac' && debug", # Bug 1729196
 ]
 
 ["browser_doorhanger_httpsUpgrade.js"]
@@ -155,8 +149,8 @@ skip-if = ["a11y_checks"] # Bugs 1858041, 1854454 and 1824058 for causing interm
 fail-if = ["a11y_checks"] # Bug 1854452 clicked dropmaker may not be focusable
 skip-if = [
   "tsan", # Bug 1661305
-  "os == 'linux' && os_version == '18.04' && debug", # Bug 1658056
-  "os == 'linux' && os_version == '18.04' && asan", # Bug 1695395
+  "os == 'linux' && debug", # Bug 1658056
+  "os == 'linux' && asan", # Bug 1695395
 ]
 
 ["browser_doorhanger_target_blank.js"]
@@ -171,7 +165,7 @@ support-files = [
   "subtst_notifications_11.html",
   "subtst_notifications_11_popup.html",
 ]
-skip-if = ["os == 'linux' && os_version == '18.04'"] # Bug 1312981, bug 1313136
+skip-if = ["os == 'linux'"] # Bug 1312981, bug 1313136
 
 ["browser_entry_point_telemetry.js"]
 
@@ -184,7 +178,7 @@ support-files = ["file_focus_before_DOMContentLoaded.sjs"]
 
 ["browser_form_history_fallback.js"]
 https_first_disabled = true # TODO remove that line and move test to HTTPS, see Bug 1776350
-skip-if = ["os == 'linux' && os_version == '18.04' && debug"] # Bug 1334336
+skip-if = ["os == 'linux' && debug"] # Bug 1334336
 support-files = [
   "subtst_notifications_1.html",
   "subtst_notifications_2.html",
@@ -214,9 +208,8 @@ support-files = ["form_signup_detection.html"]
 
 ["browser_localip_frame.js"]
 skip-if = [
-  "apple_catalina", # Bug 1683848
-  "apple_silicon", # Bug 1683848
-  "os == 'linux' && os_version == '18.04' && bits == 64 && !debug", # Bug 1683848
+  "os == 'mac' && bits == 64", # Bug 1683848
+  "os == 'linux' && !debug && bits == 64", # Bug 1683848
 ]
 
 ["browser_message_onFormSubmit.js"]
@@ -226,11 +219,8 @@ skip-if = [
 ["browser_preselect_login.js"]
 fail-if = ["a11y_checks"] # Bug 1854452 clicked ac-secondary-action may not be labeled
 skip-if = [
-  "asan",
-  "tsan",
-  "os == 'linux' && os_version == '18.04' && debug", # Bug 1840479
-  "win10_2009 && debug", # Bug 1840479
-  "win11_2009 && debug", # Bug 1840479
+  "os == 'linux' && (asan || tsan || debug)", # Bug 1840479
+  "os == 'win' && (asan || debug)", # Bug 1840479
 ]
 
 ["browser_private_window.js"]
@@ -239,7 +229,8 @@ support-files = [
   "form_password_change.html",
 ]
 skip-if = [
-  "os == 'linux' && os_version == '18.04' && bits == 64 && !debug", # Bug 1744976
+  "os == 'linux' && bits == 64 && os_version == '18.04' && !debug", # Bug 1744976
+  "os == 'win' && os_version == '10.0' && debug", # Bug 1782656
 ]
 
 ["browser_proxyAuth_prompt.js"]

toolkit/crashreporter/test/unit/xpcshell.toml

@@ -55,7 +55,7 @@ reason = "Test covering Linux-specific module handling"
 ["test_crash_rust_panic_multiline.js"]
 
 ["test_crash_stack_overflow.js"]
-run-if = ["os == 'linux'"]
+skip-if = ["os != 'linux'"]
 reason = "Still broken on macOS and not yet supported on Windows"
 
 ["test_crash_terminator.js"]
@@ -64,71 +64,71 @@ reason = "Still broken on macOS and not yet supported on Windows"
 
 ["test_crash_win64cfi_alloc_large.js"]
 head = "head_crashreporter.js head_win64cfi.js"
-run-if = ["os == 'win' && bits == 64"]
+run-if = ["os == 'win' && bits == 64 && processor == 'x86_64'"]
 reason = "Windows test specific to the x86-64 architecture"
 
 ["test_crash_win64cfi_alloc_small.js"]
 head = "head_crashreporter.js head_win64cfi.js"
-run-if = ["os == 'win' && bits == 64"]
+run-if = ["os == 'win' && bits == 64 && processor == 'x86_64'"]
 reason = "Windows test specific to the x86-64 architecture"
 
 ["test_crash_win64cfi_epilog.js"]
 head = "head_crashreporter.js head_win64cfi.js"
-run-if = ["os == 'win' && bits == 64"]
+run-if = ["os == 'win' && bits == 64 && processor == 'x86_64'"]
 reason = "Windows test specific to the x86-64 architecture"
 
 ["test_crash_win64cfi_infinite_code_chain.js"]
 head = "head_crashreporter.js head_win64cfi.js"
-run-if = ["os == 'win' && bits == 64"]
+run-if = ["os == 'win' && bits == 64 && processor == 'x86_64'"]
 reason = "Windows test specific to the x86-64 architecture"
 support-files = ["test_crash_win64cfi_infinite_code_chain.exe"]
 
 ["test_crash_win64cfi_infinite_entry_chain.js"]
 head = "head_crashreporter.js head_win64cfi.js"
-run-if = ["os == 'win' && bits == 64"]
+run-if = ["os == 'win' && bits == 64 && processor == 'x86_64'"]
 reason = "Windows test specific to the x86-64 architecture"
 support-files = ["test_crash_win64cfi_infinite_entry_chain.exe"]
 
 ["test_crash_win64cfi_invalid_exception_rva.js"]
 head = "head_crashreporter.js head_win64cfi.js"
-run-if = ["os == 'win' && bits == 64"]
+run-if = ["os == 'win' && bits == 64 && processor == 'x86_64'"]
 reason = "Windows test specific to the x86-64 architecture"
 support-files = ["test_crash_win64cfi_invalid_exception_rva.exe"]
 
 ["test_crash_win64cfi_not_a_pe.js"]
 head = "head_crashreporter.js head_win64cfi.js"
-run-if = ["os == 'win' && bits == 64"]
+run-if = ["os == 'win' && bits == 64 && processor == 'x86_64'"]
 reason = "Windows test specific to the x86-64 architecture"
 support-files = ["test_crash_win64cfi_not_a_pe.exe"]
 
 ["test_crash_win64cfi_push_nonvol.js"]
 head = "head_crashreporter.js head_win64cfi.js"
-run-if = ["os == 'win' && bits == 64"]
+run-if = ["os == 'win' && bits == 64 && processor == 'x86_64'"]
 reason = "Windows test specific to the x86-64 architecture"
 
 ["test_crash_win64cfi_save_nonvol.js"]
 head = "head_crashreporter.js head_win64cfi.js"
-run-if = ["os == 'win' && bits == 64"]
+run-if = ["os == 'win' && bits == 64 && processor == 'x86_64'"]
 reason = "Windows test specific to the x86-64 architecture"
 
 ["test_crash_win64cfi_save_nonvol_far.js"]
 head = "head_crashreporter.js head_win64cfi.js"
-run-if = ["os == 'win' && bits == 64"]
+run-if = ["os == 'win' && bits == 64 && processor == 'x86_64'"]
 reason = "Windows test specific to the x86-64 architecture"
 
 ["test_crash_win64cfi_save_xmm128.js"]
 head = "head_crashreporter.js head_win64cfi.js"
-run-if = ["os == 'win' && bits == 64"]
+run-if = ["os == 'win' && bits == 64 && processor == 'x86_64'"]
 reason = "Windows test specific to the x86-64 architecture"
 
 ["test_crash_win64cfi_save_xmm128_far.js"]
 head = "head_crashreporter.js head_win64cfi.js"
-run-if = ["os == 'win' && bits == 64"]
+run-if = ["os == 'win' && bits == 64 && processor == 'x86_64'"]
 reason = "Windows test specific to the x86-64 architecture"
 
 ["test_crash_win64cfi_unknown_op.js"]
 head = "head_crashreporter.js head_win64cfi.js"
-run-if = ["os == 'win' && bits == 64"]
+run-if = ["os == 'win' && bits == 64 && processor == 'x86_64'"]
 reason = "Windows test specific to the x86-64 architecture"
 
 ["test_crash_with_memory_report.js"]
@@ -138,10 +138,8 @@ reason = "Windows test specific to the x86-64 architecture"
 ["test_crashreporter_appmem.js"]
 # we need to skip this due to bug 838613
 skip-if = [
-  "os == 'android'",
-  "apple_silicon",
-  "apple_catalina",
-  "os == 'linux' && os_version == '18.04' && bits == 32",
+  "os != 'win' && os != 'linux'",
+  "os=='linux' && bits==32",
 ]
 
 ["test_crashreporter_crash.js"]
@@ -155,4 +153,4 @@ run-sequentially = "very high failure rate in parallel"
 run-sequentially = "very high failure rate in parallel"
 
 ["test_override_exception_handler.js"]
-run-if = ["os == 'win'"]
+skip-if = ["os != 'win'"]