diff --git a/browser/base/content/test/general/browser.toml b/browser/base/content/test/general/browser.toml index 74933bdb6338..ab8ba9567f4c 100644 --- a/browser/base/content/test/general/browser.toml +++ b/browser/base/content/test/general/browser.toml @@ -355,7 +355,6 @@ skip-if = ["os == 'linux' && fission && tsan"] # high frequency intermittent ["browser_newWindowDrop.js"] https_first_disabled = true -skip-if = ["os == 'win' && os_version == '6.1'"] # bug 1715862 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD. ["browser_new_http_window_opened_from_file_tab.js"] @@ -388,7 +387,7 @@ https_first_disabled = true skip-if = [ "os == 'mac'", "os == 'linux' && !debug", - "os == 'win' && bits == 32", + "win11_2009 && bits == 32", ] # Bug 1559410 for all instances support-files = [ "refresh_header.sjs", @@ -463,7 +462,6 @@ https_first_disabled = true # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD. ["browser_tab_drag_drop_perwindow.js"] -skip-if = ["os == 'win' && os_version == '6.1' && bits == 32"] # bug 1717587 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD. ["browser_tab_dragdrop.js"] @@ -471,7 +469,7 @@ skip-if = ["true"] # Bug 1312436, Bug 1388973 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD. ["browser_tab_dragdrop2.js"] -skip-if = ["os == 'win' && bits == 32 && !debug"] # high frequency win7 intermittent: crash +skip-if = ["win11_2009 && bits == 32 && !debug"] # high frequency win7 intermittent: crash # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD. ["browser_tabfocus.js"] diff --git a/browser/base/content/test/performance/browser.toml b/browser/base/content/test/performance/browser.toml index 591aeee0e091..bd7d56e76228 100644 --- a/browser/base/content/test/performance/browser.toml +++ b/browser/base/content/test/performance/browser.toml @@ -88,7 +88,7 @@ skip-if = [ ["browser_tabstrip_overflow_underflow.js"] skip-if = [ "os == 'win' && verify && !debug", - "os == 'win' && bits == 32", + "win11_2009 && bits == 32", ] ["browser_tabswitch.js"] @@ -97,13 +97,13 @@ skip-if = ["os == 'win'"] #Bug 1455054 ["browser_toolbariconcolor_restyles.js"] ["browser_urlbar_keyed_search.js"] -skip-if = ["os == 'win' && bits == 32"] # # Disabled on Win32 because of intermittent OOM failures (bug 1448241) +skip-if = ["win11_2009 && bits == 32"] # # Disabled on Win32 because of intermittent OOM failures (bug 1448241) ["browser_urlbar_search.js"] skip-if = [ "os == 'linux' && (debug || ccov)", # Disabled on Linux debug and ccov due to intermittent timeouts. Bug 1414126. "os == 'win' && (debug || ccov)", # Disabled on Windows debug and ccov due to intermittent timeouts. bug 1426611. - "os == 'win' && bits == 32", + "win11_2009 && bits == 32", ] ["browser_vsync_accessibility.js"] diff --git a/browser/base/content/test/performance/io/browser.toml b/browser/base/content/test/performance/io/browser.toml index d03c5f19aae0..e581849028ca 100644 --- a/browser/base/content/test/performance/io/browser.toml +++ b/browser/base/content/test/performance/io/browser.toml @@ -31,7 +31,7 @@ environment = [ skip-if = [ "apple_silicon", # bug 1707724 "socketprocess_networking", - "os == 'win' && bits == 32", + "win11_2009 && bits == 32", "os == 'win' && msix", # Bug 1833639 ] diff --git a/browser/base/content/test/plugins/browser.toml b/browser/base/content/test/plugins/browser.toml index d727ed27f87a..b941e7278dbb 100644 --- a/browser/base/content/test/plugins/browser.toml +++ b/browser/base/content/test/plugins/browser.toml @@ -8,9 +8,8 @@ support-files = [ ["browser_bug797677.js"] ["browser_enable_DRM_prompt.js"] -skip-if = ["(os == 'win' && processor == 'aarch64')"] # bug 1533164 ["browser_globalplugin_crashinfobar.js"] -skip-if = ["!crashreporter"] +run-if = ["crashreporter"] ["browser_private_browsing_eme_persistent_state.js"] diff --git a/browser/base/content/test/popupNotifications/browser.toml b/browser/base/content/test/popupNotifications/browser.toml index 0925d854cd01..6a7ff4e14e8b 100644 --- a/browser/base/content/test/popupNotifications/browser.toml +++ b/browser/base/content/test/popupNotifications/browser.toml @@ -2,63 +2,97 @@ support-files = ["head.js"] ["browser_displayURI.js"] -skip-if = ["(os == 'linux' && (debug || asan))"] +skip-if = [ + "os == 'linux' && debug", + "os == 'linux' && asan", +] ["browser_popupNotification.js"] -skip-if = ["(os == 'linux' && (debug || asan))"] +skip-if = [ + "os == 'linux' && debug", + "os == 'linux' && asan", +] ["browser_popupNotification_2.js"] https_first_disabled = true skip-if = [ - "os == 'linux' && (debug || asan)", # bug 1251135 + "os == 'linux' && debug", # bug 1251135 + "os == 'linux' && asan", # bug 1251135 "os == 'linux' && bits == 64 && os_version == '18.04'", # bug 1251135 ] ["browser_popupNotification_3.js"] https_first_disabled = true skip-if = [ - "os == 'linux' && (debug || asan)", + "os == 'linux' && debug", + "os == 'linux' && asan", "verify", ] ["browser_popupNotification_4.js"] -skip-if = ["(os == 'linux' && (debug || asan))"] +skip-if = [ + "os == 'linux' && debug", + "os == 'linux' && asan", +] ["browser_popupNotification_5.js"] skip-if = ["true"] # bug 1332646 ["browser_popupNotification_accesskey.js"] skip-if = [ - "(os == 'linux' && (debug || asan))", + "os == 'linux' && debug", + "os == 'linux' && asan", "os == 'mac'", ] ["browser_popupNotification_checkbox.js"] skip-if = [ - "(os == 'linux' && (debug || asan))", + "os == 'linux' && debug", + "os == 'linux' && asan", "a11y_checks", # Bug 1858037 to investigate intermittent a11y_checks results (fails on Try, passes on Autoland) ] ["browser_popupNotification_hide_after_identity_panel.js"] -skip-if = ["(os == 'linux' && (debug || asan))"] +skip-if = [ + "os == 'linux' && debug", + "os == 'linux' && asan", +] ["browser_popupNotification_hide_after_protections_panel.js"] -skip-if = ["(os == 'linux' && (debug || asan))"] +skip-if = [ + "os == 'linux' && debug", + "os == 'linux' && asan", +] ["browser_popupNotification_keyboard.js"] -skip-if = ["(os == 'linux' && (debug || asan))"] +skip-if = [ + "os == 'linux' && debug", + "os == 'linux' && asan", +] ["browser_popupNotification_learnmore.js"] -skip-if = ["(os == 'linux' && (debug || asan))"] +skip-if = [ + "os == 'linux' && debug", + "os == 'linux' && asan", +] ["browser_popupNotification_no_anchors.js"] https_first_disabled = true -skip-if = ["(os == 'linux' && (debug || asan))"] +skip-if = [ + "os == 'linux' && debug", + "os == 'linux' && asan", +] ["browser_popupNotification_security_delay.js"] ["browser_popupNotification_selection_required.js"] -skip-if = ["(os == 'linux' && (debug || asan))"] +skip-if = [ + "os == 'linux' && debug", + "os == 'linux' && asan", +] ["browser_reshow_in_background.js"] -skip-if = ["(os == 'linux' && (debug || asan))"] +skip-if = [ + "os == 'linux' && debug", + "os == 'linux' && asan", +] diff --git a/browser/base/content/test/popups/browser.toml b/browser/base/content/test/popups/browser.toml index 75bf210a4eab..f3ecb82b5b91 100644 --- a/browser/base/content/test/popups/browser.toml +++ b/browser/base/content/test/popups/browser.toml @@ -14,7 +14,7 @@ support-files = [ "popup_blocker_10_popups.html", ] skip-if = [ - "(os == 'linux')", # Frequent bug 1081925 and bug 1125520 failures + "os == 'linux'", # Frequent bug 1081925 and bug 1125520 failures "debug", ] diff --git a/browser/base/content/test/tabdialogs/browser.toml b/browser/base/content/test/tabdialogs/browser.toml index dbdb68afcb26..2029209cbdae 100644 --- a/browser/base/content/test/tabdialogs/browser.toml +++ b/browser/base/content/test/tabdialogs/browser.toml @@ -10,7 +10,6 @@ support-files = ["loadDelayedReply.sjs"] skip-if = [ "apple_silicon && !debug", # Bug 1786514 "apple_catalina && !debug", # Bug 1786514 - "win10_2004 && !debug", # Bug 1786514 ] support-files = ["test_page.html"] diff --git a/browser/base/content/test/tabs/browser.toml b/browser/base/content/test/tabs/browser.toml index e7435aa8e09a..b395d5edacde 100644 --- a/browser/base/content/test/tabs/browser.toml +++ b/browser/base/content/test/tabs/browser.toml @@ -238,7 +238,6 @@ support-files = [ ["browser_overflowScroll.js"] fail-if = ["a11y_checks"] # Bug 1854233 scrollbutton-down/up may not be focusable and/or labeled skip-if = [ - "win10_2004", # Bug 1775648 "win11_2009", # Bug 1797751 ] diff --git a/browser/components/about/test/unit/xpcshell.toml b/browser/components/about/test/unit/xpcshell.toml index 74383ed61ae6..c71e0f2449ce 100644 --- a/browser/components/about/test/unit/xpcshell.toml +++ b/browser/components/about/test/unit/xpcshell.toml @@ -1,6 +1,6 @@ [DEFAULT] -skip-if = ["toolkit == 'android'"] # bug 1730213 -head = '' # no value from INI +skip-if = ["os == 'android'"] # bug 1730213 +head = '' # make the firefox services (eg newtab-service) available to xpcshell firefox-appdir = "browser" diff --git a/browser/components/aboutlogins/tests/browser/browser.toml b/browser/components/aboutlogins/tests/browser/browser.toml index 4d22b61dd9fd..0b38e0dda16c 100644 --- a/browser/components/aboutlogins/tests/browser/browser.toml +++ b/browser/components/aboutlogins/tests/browser/browser.toml @@ -19,14 +19,13 @@ skip-if = [ ] ["browser_alertDismissedAfterChangingPassword.js"] -skip-if = ["os == 'mac' && os_version == '10.15' && !debug"] # Bug 1684513 +skip-if = ["apple_catalina && !debug"] # Bug 1684513 ["browser_breachAlertShowingForAddedLogin.js"] ["browser_confirmDeleteDialog.js"] ["browser_contextmenuFillLogins.js"] -skip-if = ["win10_2004 && debug"] # Bug 1723573 ["browser_copyToClipboardButton.js"] diff --git a/browser/components/aboutlogins/tests/unit/xpcshell.toml b/browser/components/aboutlogins/tests/unit/xpcshell.toml index d89279d0717f..b23e325c00a4 100644 --- a/browser/components/aboutlogins/tests/unit/xpcshell.toml +++ b/browser/components/aboutlogins/tests/unit/xpcshell.toml @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = ["toolkit == 'android'"] # bug 1730213 +skip-if = ["os == 'android'"] # bug 1730213 head = "head.js" firefox-appdir = "browser" diff --git a/browser/components/attribution/test/browser/browser.toml b/browser/components/attribution/test/browser/browser.toml index b9f73e03caea..7689f13c486e 100644 --- a/browser/components/attribution/test/browser/browser.toml +++ b/browser/components/attribution/test/browser/browser.toml @@ -2,9 +2,9 @@ support-files = ["head.js"] ["browser_AttributionCode_Mac_telemetry.js"] -skip-if = ["toolkit != 'cocoa'"] # macOS only telemetry. +run-if = ["os == 'mac'"] # macOS only telemetry. ["browser_AttributionCode_telemetry.js"] # These tests only cover the attribution cache file - which only exists on # Windows. -skip-if = ["os != 'win'"] +run-if = ["os == 'win'"] diff --git a/browser/components/contextualidentity/test/browser/browser.toml b/browser/components/contextualidentity/test/browser/browser.toml index 1b45bea672eb..f18fba599445 100644 --- a/browser/components/contextualidentity/test/browser/browser.toml +++ b/browser/components/contextualidentity/test/browser/browser.toml @@ -24,7 +24,6 @@ skip-if = ["os == 'linux' && bits == 64 && !debug"] # Bug 1731442 ["browser_favicon.js"] ["browser_forgetAPI_EME_forgetThisSite.js"] -skip-if = ["os == 'win' && processor == 'aarch64'"] # bug 1531927 ["browser_forgetAPI_cookie_getCookiesWithOriginAttributes.js"] @@ -45,7 +44,6 @@ skip-if = [ "verify && debug && os == 'linux'", "apple_silicon", # Disabled due to bleedover with other tests when run in regular suites; passes in "failures" jobs "os == 'linux' && socketprocess_networking", - "win10_2004 && !debug", ] ["browser_newtabButton.js"] diff --git a/browser/components/customizableui/test/unit/xpcshell.toml b/browser/components/customizableui/test/unit/xpcshell.toml index b8665fb3ef28..029a8a962d78 100644 --- a/browser/components/customizableui/test/unit/xpcshell.toml +++ b/browser/components/customizableui/test/unit/xpcshell.toml @@ -1,6 +1,6 @@ [DEFAULT] -head = '' # no value from INI -skip-if = ["toolkit == 'android'"] # bug 1730213 +head = '' +skip-if = ["os == 'android'"] # bug 1730213 firefox-appdir = "browser" ["test_unified_extensions_migration.js"] diff --git a/browser/components/doh/test/browser/browser.toml b/browser/components/doh/test/browser/browser.toml index d8853575d796..3c0605cb9ea9 100644 --- a/browser/components/doh/test/browser/browser.toml +++ b/browser/components/doh/test/browser/browser.toml @@ -15,10 +15,10 @@ skip-if = ["socketprocess_networking"] ["browser_providerSteering.js"] ["browser_remoteSettings_newProfile.js"] -skip-if = ["os == 'win' && bits == 32"] # Bug 1713464 +skip-if = ["win11_2009 && bits == 32"] # Bug 1713464 ["browser_remoteSettings_rollout.js"] -skip-if = ["os == 'win' && bits == 32"] # Bug 1713464 +skip-if = ["win11_2009 && bits == 32"] # Bug 1713464 ["browser_rollback.js"] diff --git a/browser/components/doh/test/unit/xpcshell.toml b/browser/components/doh/test/unit/xpcshell.toml index 08644833d8c0..9d40b7462104 100644 --- a/browser/components/doh/test/unit/xpcshell.toml +++ b/browser/components/doh/test/unit/xpcshell.toml @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = ["toolkit == 'android'"] # bug 1730213 +skip-if = ["os == 'android'"] # bug 1730213 head = "head.js" firefox-appdir = "browser" support-files = ["../../../../../netwerk/test/unit/http2-ca.pem"] diff --git a/browser/components/downloads/test/browser/browser.toml b/browser/components/downloads/test/browser/browser.toml index 34bcaafdf7c7..8236e452e618 100644 --- a/browser/components/downloads/test/browser/browser.toml +++ b/browser/components/downloads/test/browser/browser.toml @@ -43,8 +43,7 @@ support-files = ["test_spammy_page.html"] ["browser_downloads_panel_context_menu.js"] skip-if = [ - "os == 'win' && os_version == '10.0' && bits == 64 && !debug", # Bug 1719949 - "win10_2004 && bits == 32 && debug", # Bug 1727925 + "win10_2009 && bits == 64 && !debug", # Bug 1719949 ] ["browser_downloads_panel_ctrl_click.js"] diff --git a/browser/components/downloads/test/unit/xpcshell.toml b/browser/components/downloads/test/unit/xpcshell.toml index 3371972c8832..37a26b4b656a 100644 --- a/browser/components/downloads/test/unit/xpcshell.toml +++ b/browser/components/downloads/test/unit/xpcshell.toml @@ -1,7 +1,7 @@ [DEFAULT] head = "head.js" firefox-appdir = "browser" -skip-if = ["toolkit == 'android'"] # bug 1730213 +skip-if = ["os == 'android'"] # bug 1730213 ["test_DownloadLastDir_basics.js"] diff --git a/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.toml b/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.toml index 9bd96f3b64cf..69dd3e510326 100644 --- a/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.toml +++ b/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.toml @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = ["toolkit == 'android'"] # bug 1730213 +skip-if = ["os == 'android'"] # bug 1730213 firefox-appdir = "browser" head = "head.js" support-files = ["policytest_v0.1.xpi"] diff --git a/browser/components/extensions/test/browser/browser.toml b/browser/components/extensions/test/browser/browser.toml index 3301483a6d9b..c219c4f17d65 100644 --- a/browser/components/extensions/test/browser/browser.toml +++ b/browser/components/extensions/test/browser/browser.toml @@ -245,7 +245,6 @@ skip-if = [ ["browser_ext_incognito_views.js"] skip-if = [ "apple_silicon && !fission", # Disabled due to bleedover with other tests when run in regular suites; passes in "failures" jobs - "win10_2004 && bits == 32 && debug", # Bug 1727925 ] ["browser_ext_lastError.js"] @@ -374,7 +373,7 @@ skip-if = ["os == 'linux' && swgl && fission && tsan"] # high frequency intermit ["browser_ext_port_disconnect_on_crash.js"] https_first_disabled = true -skip-if = ["!crashreporter"] +run-if = ["crashreporter"] ["browser_ext_port_disconnect_on_window_close.js"] @@ -484,7 +483,6 @@ https_first_disabled = true https_first_disabled = true skip-if = [ "os == 'mac'", # Bug 1722607 - "win10_2004 && debug", # high frequency intermittent Bug 1722607 "os == 'linux' && debug", #Bug 1722607 ] @@ -607,8 +605,6 @@ https_first_disabled = true ["browser_ext_url_overrides_newtab.js"] skip-if = [ "os == 'linux' && os_version == '18.04'", # Bug 1651261 - "win10_2004 && asan", # Bug 1723573 - "win10_2004 && debug", # Bug 1723573 "win11_2009 && asan", # Bug 1797751 "win11_2009 && debug", # Bug 1797751 ] diff --git a/browser/components/migration/tests/unit/xpcshell.toml b/browser/components/migration/tests/unit/xpcshell.toml index 40ebe5de40b8..b599a6436262 100644 --- a/browser/components/migration/tests/unit/xpcshell.toml +++ b/browser/components/migration/tests/unit/xpcshell.toml @@ -2,7 +2,7 @@ head = "head_migration.js" tags = "condprof" firefox-appdir = "browser" -skip-if = ["toolkit == 'android'"] # bug 1730213 +skip-if = ["os == 'android'"] # bug 1730213 prefs = ["browser.migrate.showBookmarksToolbarAfterMigration=true"] support-files = [ "Library/**", @@ -33,7 +33,8 @@ run-if = ["os == 'linux'"] ["test_Chrome_credit_cards.js"] skip-if = [ - "os != 'win' && os != 'mac'", + "os == 'linux'", + "os == 'android'", "condprof", # bug 1769154 - not realistic for condprof ] @@ -46,13 +47,15 @@ skip-if = ["os != 'mac'"] # Relies on ULibDir ["test_Chrome_passwords.js"] skip-if = [ - "os != 'win' && os != 'mac'", + "os == 'linux'", + "os == 'android'", "condprof", # bug 1769154 - not realistic for condprof ] ["test_Chrome_passwords_emptySource.js"] skip-if = [ - "os != 'win' && os != 'mac'", + "os == 'linux'", + "os == 'android'", "condprof", # bug 1769154 - not realistic for condprof ] support-files = ["LibraryWithNoData/**"] diff --git a/browser/components/newtab/test/xpcshell/xpcshell.toml b/browser/components/newtab/test/xpcshell/xpcshell.toml index 007d8ef2799d..752653782704 100644 --- a/browser/components/newtab/test/xpcshell/xpcshell.toml +++ b/browser/components/newtab/test/xpcshell/xpcshell.toml @@ -1,7 +1,7 @@ [DEFAULT] head = "head.js" firefox-appdir = "browser" -skip-if = ["toolkit == 'android'"] # bug 1730213 +skip-if = ["os == 'android'"] # bug 1730213 prefs = [ "browser.startup.homepage.abouthome_cache.enabled=true", "browser.startup.homepage.abouthome_cache.testing=true", diff --git a/browser/components/pagedata/tests/unit/xpcshell.toml b/browser/components/pagedata/tests/unit/xpcshell.toml index 1a94fd5a0abf..a04ab47455c7 100644 --- a/browser/components/pagedata/tests/unit/xpcshell.toml +++ b/browser/components/pagedata/tests/unit/xpcshell.toml @@ -1,6 +1,6 @@ [DEFAULT] firefox-appdir = "browser" -skip-if = ["toolkit == 'android'"] # bug 1730213 +skip-if = ["os == 'android'"] # bug 1730213 support-files = ["head.js"] head = "head.js" diff --git a/browser/components/places/tests/chrome/chrome.toml b/browser/components/places/tests/chrome/chrome.toml index 5a5e9a209b7f..349b8055cc2c 100644 --- a/browser/components/places/tests/chrome/chrome.toml +++ b/browser/components/places/tests/chrome/chrome.toml @@ -4,9 +4,6 @@ support-files = ["head.js"] ["test_0_bug510634.xhtml"] ["test_bug1163447_selectItems_through_shortcut.xhtml"] -skip-if = [ - "(os == 'win' && processor == 'aarch64')", # bug 1532775 -] ["test_bug549192.xhtml"] diff --git a/browser/components/places/tests/unit/xpcshell.toml b/browser/components/places/tests/unit/xpcshell.toml index 8a9097792279..75727e359a9f 100644 --- a/browser/components/places/tests/unit/xpcshell.toml +++ b/browser/components/places/tests/unit/xpcshell.toml @@ -1,7 +1,7 @@ [DEFAULT] head = "head_bookmarks.js" firefox-appdir = "browser" -skip-if = ["toolkit == 'android'"] # bug 1730213 +skip-if = ["os == 'android'"] # bug 1730213 support-files = [ "bookmarks.glue.html", "bookmarks.glue.json", diff --git a/browser/components/preferences/tests/browser.toml b/browser/components/preferences/tests/browser.toml index 89b1e219c78f..17d5a6cfb30c 100644 --- a/browser/components/preferences/tests/browser.toml +++ b/browser/components/preferences/tests/browser.toml @@ -49,7 +49,7 @@ support-files = ["browser_bug1184989_prevent_scrolling_when_preferences_flipped. ["browser_cert_export.js"] ["browser_change_app_handler.js"] -skip-if = ["os != 'win'"] # Windows-specific handler application selection dialog +run-if = ["os == 'win'"] # Windows-specific handler application selection dialog ["browser_checkspelling.js"] @@ -58,7 +58,10 @@ skip-if = ["os != 'win'"] # Windows-specific handler application selection dialo ["browser_connection_bug1445991.js"] ["browser_connection_bug1505330.js"] -skip-if = ["verify && debug && (os == 'linux' || os == 'mac')"] +skip-if = [ + "verify && debug && os == 'linux'", + "verify && debug && os == 'mac'", +] ["browser_connection_bug388287.js"] @@ -101,7 +104,8 @@ skip-if = [ ["browser_extension_controlled.js"] skip-if = [ "tsan", - "ccov && (os == 'linux' || os == 'win')", # Linux: bug 1613530, Windows: bug 1437051 + "ccov && os == 'linux'", # Linux: bug 1613530 + "ccov && os == 'win'", # Windows: bug 1437051 ] ["browser_filetype_dialog.js"] @@ -240,7 +244,6 @@ skip-if = ["tsan"] # Bug 1678829 ["browser_search_subdialogs_within_preferences_site_data.js"] ["browser_search_within_preferences_1.js"] -skip-if = ["os == 'win' && processor == 'aarch64'"] # Bug 1536560 ["browser_search_within_preferences_2.js"] diff --git a/browser/components/preferences/tests/siteData/browser.toml b/browser/components/preferences/tests/siteData/browser.toml index 03b821d73e8e..9f4f8306e1d3 100644 --- a/browser/components/preferences/tests/siteData/browser.toml +++ b/browser/components/preferences/tests/siteData/browser.toml @@ -14,7 +14,6 @@ support-files = [ ["browser_siteData2.js"] skip-if = [ - "win10_2004 && (!debug && !asan)", # Bug 1669937 "win11_2009 && (!debug && !asan)", # Bug 1797751 "apple_catalina && debug", # Bug 1775910 ] diff --git a/browser/components/search/test/unit/xpcshell.toml b/browser/components/search/test/unit/xpcshell.toml index d81589403840..61cdb83378bf 100644 --- a/browser/components/search/test/unit/xpcshell.toml +++ b/browser/components/search/test/unit/xpcshell.toml @@ -3,7 +3,7 @@ support-files = [ "../../../../../services/settings/dumps/main/search-config-v2.json", ] prefs = ["browser.search.log=true"] -skip-if = ["toolkit == 'android'"] # bug 1730213 +skip-if = ["os == 'android'"] # bug 1730213 firefox-appdir = "browser" ["test_search_telemetry_categorization_logic.js"] diff --git a/browser/components/sessionstore/test/browser.toml b/browser/components/sessionstore/test/browser.toml index 1be30d66dcfb..4eb9f46eefbf 100644 --- a/browser/components/sessionstore/test/browser.toml +++ b/browser/components/sessionstore/test/browser.toml @@ -327,7 +327,6 @@ skip-if = true # Bug 1775616 ["browser_background_tab_crash.js"] https_first_disabled = true run-if = ["crashreporter"] -# Disabled on debug for frequent intermittent failures: ["browser_backup_recovery.js"] https_first_disabled = true @@ -362,10 +361,9 @@ https_first_disabled = true ["browser_crashedTabs.js"] https_first_disabled = true +run-if = ["crashreporter"] skip-if = [ - "!crashreporter", "verify", - "win10_2004", # high frequency intermittent, Bug 1684120 - timed out "os == 'mac'", # high frequency intermittent ] @@ -399,7 +397,7 @@ skip-if = ["verify && debug"] ["browser_formdata_face.js"] ["browser_formdata_format.js"] -skip-if = ["!debug && (os == 'linux')"] # Bug 1535645 +skip-if = ["!debug && os == 'linux'"] # Bug 1535645 ["browser_formdata_max_size.js"] @@ -431,7 +429,6 @@ https_first_disabled = true skip-if = [ "apple_silicon", # Disabled due to bleedover with other tests when run in regular suites; passes in "failures" jobs "apple_catalina && !debug", # Bug 1638958 - "win10_2004 && bits == 64 && !debug", # Bug 1638958 "os == 'linux' && !debug", # Bug 1638958 "win11_2009 && !debug", # Bug 1775605 ] diff --git a/browser/components/sessionstore/test/unit/xpcshell.toml b/browser/components/sessionstore/test/unit/xpcshell.toml index d8f5835f1555..6a53151b2be3 100644 --- a/browser/components/sessionstore/test/unit/xpcshell.toml +++ b/browser/components/sessionstore/test/unit/xpcshell.toml @@ -2,7 +2,7 @@ head = "head.js" tags = "condprof" firefox-appdir = "browser" -skip-if = ["toolkit == 'android'"] # bug 1730213 +skip-if = ["os == 'android'"] # bug 1730213 support-files = [ "data/sessionCheckpoints_all.json", "data/sessionstore_invalid.js", diff --git a/browser/components/shell/test/unit/xpcshell.toml b/browser/components/shell/test/unit/xpcshell.toml index 02a51628cbcb..200b895ca318 100644 --- a/browser/components/shell/test/unit/xpcshell.toml +++ b/browser/components/shell/test/unit/xpcshell.toml @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = ["toolkit == 'android'"] # bug 1730213 +skip-if = ["os == 'android'"] # bug 1730213 firefox-appdir = "browser" ["test_macOS_showSecurityPreferences.js"] diff --git a/browser/components/syncedtabs/test/xpcshell/xpcshell.toml b/browser/components/syncedtabs/test/xpcshell/xpcshell.toml index b8435f01f572..d343593644e1 100644 --- a/browser/components/syncedtabs/test/xpcshell/xpcshell.toml +++ b/browser/components/syncedtabs/test/xpcshell/xpcshell.toml @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = ["toolkit == 'android'"] # bug 1730213 +skip-if = ["os == 'android'"] # bug 1730213 head = "head.js" firefox-appdir = "browser" diff --git a/browser/components/tests/unit/xpcshell.toml b/browser/components/tests/unit/xpcshell.toml index c7f6772023dd..1b566698ee3f 100644 --- a/browser/components/tests/unit/xpcshell.toml +++ b/browser/components/tests/unit/xpcshell.toml @@ -1,7 +1,7 @@ [DEFAULT] head = "head.js" firefox-appdir = "browser" -skip-if = ["toolkit == 'android'"] # bug 1730213 +skip-if = ["os == 'android'"] # bug 1730213 support-files = ["distribution.ini"] ["test_browserGlue_migration_ctrltab_recently_used_order.js"] diff --git a/browser/components/urlbar/tests/quicksuggest/unit/xpcshell.toml b/browser/components/urlbar/tests/quicksuggest/unit/xpcshell.toml index 459d62426139..b7c5ebb23224 100644 --- a/browser/components/urlbar/tests/quicksuggest/unit/xpcshell.toml +++ b/browser/components/urlbar/tests/quicksuggest/unit/xpcshell.toml @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = ["toolkit == 'android'"] # bug 1730213 +skip-if = ["os == 'android'"] # bug 1730213 head = "../../unit/head.js head.js" firefox-appdir = "browser" diff --git a/browser/components/urlbar/tests/unit/xpcshell.toml b/browser/components/urlbar/tests/unit/xpcshell.toml index 693358dc0402..880fd88fa890 100644 --- a/browser/components/urlbar/tests/unit/xpcshell.toml +++ b/browser/components/urlbar/tests/unit/xpcshell.toml @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = ["toolkit == 'android'"] # bug 1730213 +skip-if = ["os == 'android'"] # bug 1730213 head = "head.js" firefox-appdir = "browser" support-files = ["data/engine.xml"] diff --git a/browser/extensions/formautofill/test/browser/browser.toml b/browser/extensions/formautofill/test/browser/browser.toml index 897c1d8a39ba..b8a4d113e196 100644 --- a/browser/extensions/formautofill/test/browser/browser.toml +++ b/browser/extensions/formautofill/test/browser/browser.toml @@ -30,7 +30,6 @@ skip-if = [ ["browser_editAddressDialog.js"] skip-if = [ "verify", - "win10_2004", # Bug 1723573 "win11_2009", # Bug 1797751 ] diff --git a/browser/extensions/formautofill/test/browser/heuristics/browser.toml b/browser/extensions/formautofill/test/browser/heuristics/browser.toml index 1b1e0ce02f9b..42455d592217 100644 --- a/browser/extensions/formautofill/test/browser/heuristics/browser.toml +++ b/browser/extensions/formautofill/test/browser/heuristics/browser.toml @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = ["toolkit == 'android'"] # bug 1730213 +skip-if = ["os == 'android'"] # bug 1730213 support-files = [ "../head.js", "../../fixtures/**", diff --git a/browser/extensions/formautofill/test/browser/heuristics/third_party/browser.toml b/browser/extensions/formautofill/test/browser/heuristics/third_party/browser.toml index 3067fd6d1d98..aba28e6597af 100644 --- a/browser/extensions/formautofill/test/browser/heuristics/third_party/browser.toml +++ b/browser/extensions/formautofill/test/browser/heuristics/third_party/browser.toml @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = ["toolkit == 'android'"] # bug 1730213 +skip-if = ["os == 'android'"] # bug 1730213 support-files = [ "../../head.js", "../../../fixtures/**", diff --git a/browser/extensions/formautofill/test/unit/xpcshell.toml b/browser/extensions/formautofill/test/unit/xpcshell.toml index 6d06d1059f17..ff5e02459263 100644 --- a/browser/extensions/formautofill/test/unit/xpcshell.toml +++ b/browser/extensions/formautofill/test/unit/xpcshell.toml @@ -1,7 +1,7 @@ [DEFAULT] skip-if = [ "os == 'linux' && ccov", # bug 1821945 - "toolkit == 'android'", # bug 1730213 + "os == 'android'", # bug 1730213 ] firefox-appdir = "browser" head = "head.js" diff --git a/browser/modules/test/browser/browser.toml b/browser/modules/test/browser/browser.toml index 1b46694bef36..21b3cdf18c74 100644 --- a/browser/modules/test/browser/browser.toml +++ b/browser/modules/test/browser/browser.toml @@ -83,5 +83,5 @@ skip-if = [ "os == 'mac'", # Bug 1528429 "os == 'linux' && bits == 64 && os_version == '18.04'", # Bug 1619835 "win10_2009 && bits == 64", # Bug 1619835 - "os == 'win' && bits == 32 && debug", # Bug 1619835 + "win11_2009 && bits == 32 && debug", # Bug 1619835 ] diff --git a/browser/modules/test/unit/xpcshell.toml b/browser/modules/test/unit/xpcshell.toml index 2b4a9a66ea5d..1738e921944b 100644 --- a/browser/modules/test/unit/xpcshell.toml +++ b/browser/modules/test/unit/xpcshell.toml @@ -1,7 +1,7 @@ [DEFAULT] -head = '' # no value from INI +head = '' firefox-appdir = "browser" -skip-if = ["toolkit == 'android'"] # bug 1730213 +skip-if = ["os == 'android'"] # bug 1730213 ["test_E10SUtils_nested_URIs.js"] diff --git a/browser/tools/mozscreenshots/tests/xpcshell/xpcshell.toml b/browser/tools/mozscreenshots/tests/xpcshell/xpcshell.toml index 58cd750a4cdc..16a78095bff2 100644 --- a/browser/tools/mozscreenshots/tests/xpcshell/xpcshell.toml +++ b/browser/tools/mozscreenshots/tests/xpcshell/xpcshell.toml @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = ["toolkit == 'android'"] # bug 1730213 +skip-if = ["os == 'android'"] # bug 1730213 support-files = ["../../mozscreenshots/extension/TestRunner.sys.mjs"] ["test_testConfigurations.js"] diff --git a/devtools/client/aboutdebugging/test/browser/browser.toml b/devtools/client/aboutdebugging/test/browser/browser.toml index 3ca2569b1c84..771f58b7e3bb 100644 --- a/devtools/client/aboutdebugging/test/browser/browser.toml +++ b/devtools/client/aboutdebugging/test/browser/browser.toml @@ -43,7 +43,6 @@ tags = "webextensions" skip-if = [ "verify && debug", # verify: crashes on shutdown, timeouts "os == 'linux' && debug", # linux debug Bug 1299001 - "win10_2004 && !debug", # Bug 1744778 ] tags = "webextensions" diff --git a/devtools/client/accessibility/test/browser/browser.toml b/devtools/client/accessibility/test/browser/browser.toml index 901be9448dec..e54518785723 100644 --- a/devtools/client/accessibility/test/browser/browser.toml +++ b/devtools/client/accessibility/test/browser/browser.toml @@ -13,7 +13,6 @@ support-files = [ ["browser_accessibility_context_menu_inspector.js"] skip-if = [ - "win10_2004", # Bug 1723573 "apple_catalina", # Bug 1713392 ] @@ -23,7 +22,6 @@ skip-if = ["os == 'linux' && asan"] # bug 1666940 ["browser_accessibility_mutations.js"] skip-if = [ - "os == 'win' && processor == 'aarch64'", # bug 1533534 "os == 'linux' && bits == 64 && fission", # Bug 1675445 ] diff --git a/devtools/client/debugger/test/mochitest/browser_aj.toml b/devtools/client/debugger/test/mochitest/browser_aj.toml index 4b5836a5cd61..0f624a04e5e7 100644 --- a/devtools/client/debugger/test/mochitest/browser_aj.toml +++ b/devtools/client/debugger/test/mochitest/browser_aj.toml @@ -2,7 +2,6 @@ tags = "devtools" subsuite = "devtools" skip-if = [ - "os == 'linux' && debug && bits == 32", "asan", # Frequent failures when opening tabs due to OOM issues, bug 1760260 ] support-files = [ @@ -209,7 +208,6 @@ skip-if = ["win11_2009"] # Bug 1798331 ["browser_dbg-features-browser-toolbox-source-tree.js"] skip-if = [ "asan", # Bug 1591064 - "win10_2004", # Bug 1767702 "win11_2009", # Bug 1798331 ] diff --git a/devtools/client/debugger/test/mochitest/browser_kz.toml b/devtools/client/debugger/test/mochitest/browser_kz.toml index 6ee745507bfa..5af2243d7fc9 100644 --- a/devtools/client/debugger/test/mochitest/browser_kz.toml +++ b/devtools/client/debugger/test/mochitest/browser_kz.toml @@ -2,7 +2,6 @@ tags = "devtools" subsuite = "devtools" skip-if = [ - "os == 'linux' && debug && bits == 32", "asan", # Frequent failures when opening tabs due to OOM issues, bug 1760260 ] support-files = [ diff --git a/devtools/client/framework/test/browser.toml b/devtools/client/framework/test/browser.toml index 415a8d46d486..e7d979ebb306 100644 --- a/devtools/client/framework/test/browser.toml +++ b/devtools/client/framework/test/browser.toml @@ -160,7 +160,6 @@ skip-if = [ ["browser_toolbox_fission_navigation.js"] skip-if = [ "os == 'linux'", # Bug 1742672 - "win10_2004", # Bug 1742672 ] ["browser_toolbox_frames_list.js"] diff --git a/devtools/client/inspector/animation/test/browser.toml b/devtools/client/inspector/animation/test/browser.toml index ca26858fcd80..4d32545a61d1 100644 --- a/devtools/client/inspector/animation/test/browser.toml +++ b/devtools/client/inspector/animation/test/browser.toml @@ -56,14 +56,12 @@ 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_animation_animation-target.js"] -skip-if = ["win10_2004"] # Bug 1723573 ["browser_animation_animation-target_highlight.js"] fail-if = ["a11y_checks"] # Bug 1849028 clicked element may not be focusable and/or labeled skip-if = [ "apple_catalina && !debug", # Disabled in Bug 1713158. Intemittent bug: Bug 1665011 "os == 'linux' && !debug && !asan && !swgl && !ccov", # Bug 1665011 - "win10_2004", # Bug 1723573 "win11_2009", # Bug 1798331 "a11y_checks && debug", # Bugs 1849028 and 1858041 for causing intermittent test results ] @@ -153,7 +151,7 @@ fail-if = ["a11y_checks"] # Bug 1849028 clicked element may not be focusable and ["browser_animation_logic_mutations_fast.js"] skip-if = [ "debug", - "os == 'win' && bits == 32", # Bug 1567800 + "win11_2009' && bits == 32", # Bug 1567800 "os == 'linux' && !asan && !debug && !swgl && !ccov", # Bug 1567800 ] diff --git a/devtools/client/inspector/rules/test/browser_part1.toml b/devtools/client/inspector/rules/test/browser_part1.toml index 0d4ecf6f7693..d4c154d6b2a9 100644 --- a/devtools/client/inspector/rules/test/browser_part1.toml +++ b/devtools/client/inspector/rules/test/browser_part1.toml @@ -75,7 +75,6 @@ skip-if = ["verify && debug && os == 'win'"] skip-if = [ "os == 'linux' && os_version == '18.04' && !debug", # Bug 1559315 "apple_catalina", # Bug 1713158 - "win10_2004", # Bug 1559315, 1723573 "win11_2009", # Bug 1797751 ] @@ -109,7 +108,6 @@ skip-if = ["os == 'win' && !debug"] # Bug 1703465 ["browser_rules_color_scheme_simulation_meta.js"] ["browser_rules_color_scheme_simulation_rdm.js"] -skip-if = ["win10_2004"] # Bug 1723573 ["browser_rules_colorpicker-and-image-tooltip_01.js"] diff --git a/devtools/client/inspector/rules/test/browser_part2.toml b/devtools/client/inspector/rules/test/browser_part2.toml index 2cb52d34adfd..5fdd7457502c 100644 --- a/devtools/client/inspector/rules/test/browser_part2.toml +++ b/devtools/client/inspector/rules/test/browser_part2.toml @@ -128,7 +128,6 @@ skip-if = ["os == 'linux'"] # focusEditableField times out consistently on linux ["browser_rules_gridline-names-autocomplete.js"] skip-if = [ - "win10_2004", # Bug 1723573 "os == 'mac' && !debug", # Bug 1675592; high frequency with/out fission ] diff --git a/devtools/client/inspector/test/browser.toml b/devtools/client/inspector/test/browser.toml index 52b6bd9dae7a..9b7153bb9d05 100644 --- a/devtools/client/inspector/test/browser.toml +++ b/devtools/client/inspector/test/browser.toml @@ -298,7 +298,6 @@ skip-if = ["debug"] # Bug 1250058 - Docshell leak on debug ["browser_inspector_inspect_loading_document.js"] ["browser_inspector_inspect_mutated_node.js"] -skip-if = ["win10_2004"] # Bug 1723573 ["browser_inspector_inspect_node_contextmenu.js"] diff --git a/devtools/client/netmonitor/src/har/test/browser.toml b/devtools/client/netmonitor/src/har/test/browser.toml index 77fe3d2dc0a4..7a11328f5a41 100644 --- a/devtools/client/netmonitor/src/har/test/browser.toml +++ b/devtools/client/netmonitor/src/har/test/browser.toml @@ -23,7 +23,6 @@ support-files = [ skip-if = [ "!debug && os == 'mac'", #Bug 1622925 "!debug && os == 'linux'", #Bug 1622925 - "win10_2004", # Bug 1723573 "win11_2009", # Bug 1797751 ] diff --git a/devtools/client/netmonitor/test/browser.toml b/devtools/client/netmonitor/test/browser.toml index 48e6d9836e3e..2d0ae7195813 100644 --- a/devtools/client/netmonitor/test/browser.toml +++ b/devtools/client/netmonitor/test/browser.toml @@ -125,7 +125,8 @@ fail-if = ["a11y_checks"] # Bug 1849028 clicked element may not be focusable and ["browser_net_block-pattern.js"] skip-if = [ "os == 'linux'", - "debug && (os == 'win' || os == 'mac')", # Bug 1603355 + "debug && os == 'win'", # Bug 1603355 + "debug && os == 'mac'", # Bug 1603355 ] ["browser_net_block-serviceworker.js"] @@ -139,7 +140,6 @@ skip-if = [ ["browser_net_cached-status.js"] skip-if = [ "verify", - "win10_2004", # Bug 1723573 "win11_2009", # Bug 1797751 ] @@ -179,14 +179,12 @@ skip-if = [ ["browser_net_columns_time.js"] skip-if = [ - "win10_2004", # Bug 1723573 "win11_2009", # Bug 1797751 ] ["browser_net_complex-params.js"] skip-if = [ "verify && !debug && os == 'win'", - "win10_2004", # Bug 1723573 "win11_2009", # Bug 1797751 ] @@ -208,9 +206,8 @@ skip-if = ["verify && debug && os == 'win'"] ["browser_net_copy_params.js"] skip-if = [ - "win10_2004", # Bug 1723573 "win11_2009", # Bug 1797751 - "(verify && !debug && (os == 'mac'))", # bug 1328915, disable linux32 debug devtools for timeouts + "verify && !debug && os == 'mac'", # bug 1328915, disable linux32 debug devtools for timeouts ] ["browser_net_copy_response.js"] @@ -222,7 +219,6 @@ skip-if = [ ["browser_net_cors_requests.js"] ["browser_net_curl-utils.js"] -skip-if = ["win10_2004"] # Bug 1723573 ["browser_net_cyrillic-01.js"] @@ -268,7 +264,6 @@ skip-if = ["verify"] # Bug 1607678 ["browser_net_fonts.js"] fail-if = ["a11y_checks"] # Bug 1849028 clicked element may not be focusable and/or labeled -skip-if = ["win10_2004"] # Bug 1723573 ["browser_net_footer-summary.js"] @@ -472,7 +467,6 @@ skip-if = ["true"] # Bug 1373558 ["browser_net_status-bar-transferred-size.js"] ["browser_net_status-bar.js"] -skip-if = ["win10_2004"] # Bug 1723573 ["browser_net_status-codes.js"] @@ -521,7 +515,6 @@ fail-if = ["a11y_checks"] # Bug 1849028 clicked element may not be focusable and ["browser_net_websocket_stacks.js"] ["browser_net_worker_stacks.js"] -skip-if = ["win10_2004"] # Bug 1723573 ["browser_net_ws-basic.js"] diff --git a/devtools/client/shared/test/browser.toml b/devtools/client/shared/test/browser.toml index e35d8fcc52ca..4c55c7fee930 100644 --- a/devtools/client/shared/test/browser.toml +++ b/devtools/client/shared/test/browser.toml @@ -254,7 +254,6 @@ skip-if = [ ["browser_layoutHelpers_getBoxQuads1.js"] skip-if = [ "verify", - "win10_2004", # Bug 1723573 ] ["browser_layoutHelpers_getBoxQuads2.js"] diff --git a/devtools/client/storage/test/browser.toml b/devtools/client/storage/test/browser.toml index 321b88883854..28b4b0425843 100644 --- a/devtools/client/storage/test/browser.toml +++ b/devtools/client/storage/test/browser.toml @@ -77,7 +77,6 @@ skip-if = ["win11_2009"] # Bug 1797751 ["browser_storage_cookies_navigation.js"] skip-if = [ - "win10_2004 && asan && fission", # high frequency intermittent "os == 'linux' && debug && fission && socketprocess_networking", # high frequency intermittent ] @@ -133,7 +132,6 @@ fail-if = ["a11y_checks"] # Bug 1849028 clicked element may not be focusable and ["browser_storage_indexeddb_duplicate_names.js"] skip-if = [ - "win10_2004", # Bug 1723573 "win11_2009", # Bug 1797751 ] @@ -142,7 +140,7 @@ skip-if = ["asan"] # Bug 1591064 ["browser_storage_indexeddb_navigation.js"] skip-if = [ - "os == 'win' && os_version == '10.0' && bits == 64", # Bug 1694274 + "win10_2009 && bits == 64", # Bug 1694274 "os == 'linux' && bits == 64", # Bug 1694274 ] diff --git a/devtools/client/webconsole/test/browser/_jsterm.toml b/devtools/client/webconsole/test/browser/_jsterm.toml index 44987d95cde8..c9be46216a3d 100644 --- a/devtools/client/webconsole/test/browser/_jsterm.toml +++ b/devtools/client/webconsole/test/browser/_jsterm.toml @@ -34,14 +34,14 @@ support-files = [ ["browser_jsterm_add_edited_input_to_history.js"] ["browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js"] -skip-if = ["debug && os == 'win' && bits == 32"] # Bug 1620856 +skip-if = ["win11_2009 && debug && bits == 32"] # Bug 1620856 ["browser_jsterm_autocomplete_accept_no_scroll.js"] ["browser_jsterm_autocomplete_array_no_index.js"] ["browser_jsterm_autocomplete_arrow_keys.js"] -skip-if = ["debug && os == 'win' && bits == 32"] # Bug 1620856 +skip-if = ["win11_2009 && debug && bits == 32"] # Bug 1620856 ["browser_jsterm_autocomplete_await.js"] diff --git a/devtools/client/webconsole/test/browser/_webconsole.toml b/devtools/client/webconsole/test/browser/_webconsole.toml index 101214c710bd..0b302b64819d 100644 --- a/devtools/client/webconsole/test/browser/_webconsole.toml +++ b/devtools/client/webconsole/test/browser/_webconsole.toml @@ -654,7 +654,6 @@ fail-if = ["a11y_checks"] # Bug 1849028 clicked element may not be focusable and ["browser_webconsole_requestStorageAccess_errors.js"] skip-if = [ - "win10_2004", # Bug 1723573 "http3", # Bug 1829298 "http2", "a11y_checks", # Bugs 1858041, 1849028 and 1849179 for causing crashes @@ -738,7 +737,6 @@ skip-if = [ ["browser_webconsole_stubs_network_event.js"] skip-if = [ - "win10_2004", # Bug 1723573 "win11_2009", # Bug 1798331 "http3", # Bug 1829298 "http2", diff --git a/devtools/server/tests/browser/browser.toml b/devtools/server/tests/browser/browser.toml index e377629c8d1c..e03ab5649ad4 100644 --- a/devtools/server/tests/browser/browser.toml +++ b/devtools/server/tests/browser/browser.toml @@ -156,7 +156,6 @@ skip-if = ["true"] # Bug 1183605 ["browser_inspector-isScrollable.js"] ["browser_inspector-mutations-childlist.js"] -skip-if = ["win10_2004 && fission && debug && socketprocess_networking"] # high frequency intermittent ["browser_inspector-release.js"] @@ -198,7 +197,6 @@ https_first_disabled = true skip-if = [ "debug", # Bug 1715916 - test is having race conditions on slow hardware "tsan", # high frequency intermittent - "win10_2004 && asan && fission", # high frequency intermittent "win11_2009 && asan", # high frequency intermittent ] diff --git a/devtools/shared/commands/resource/tests/browser.toml b/devtools/shared/commands/resource/tests/browser.toml index ce6b89e6709d..2efd162b1429 100644 --- a/devtools/shared/commands/resource/tests/browser.toml +++ b/devtools/shared/commands/resource/tests/browser.toml @@ -56,7 +56,6 @@ support-files = [ ["browser_resources_document_events.js"] skip-if = [ - "win10_2004", # Bug 1723573 "os == 'linux' && bits == 64", # Bug 1715878 ] @@ -93,7 +92,6 @@ skip-if = [ ["browser_resources_sources.js"] skip-if = [ "os == 'linux' && bits == 64", # Bug 1744565 - "win10_2004 && !debug", # Bug 1744565 "win11_2009", # Bug 1767772 "apple_catalina", # Bug 1767772 ] diff --git a/devtools/shared/commands/target/tests/browser.toml b/devtools/shared/commands/target/tests/browser.toml index 68eaf2faf413..3a0c59de6f6c 100644 --- a/devtools/shared/commands/target/tests/browser.toml +++ b/devtools/shared/commands/target/tests/browser.toml @@ -25,7 +25,6 @@ support-files = [ ["browser_target_command_frames.js"] ["browser_target_command_frames_popups.js"] -skip-if = ["win10_2004 && debug && fission && socketprocess_networking"] # high frequency intermittent ["browser_target_command_frames_reload_server_side_targets.js"] skip-if = [ diff --git a/docshell/test/chrome/chrome.toml b/docshell/test/chrome/chrome.toml index 37aaa1d9c11f..9d382a5f865b 100644 --- a/docshell/test/chrome/chrome.toml +++ b/docshell/test/chrome/chrome.toml @@ -67,20 +67,18 @@ skip-if = ["true"] # bug 1393441 ["test_bug298622.xhtml"] ["test_bug301397.xhtml"] -skip-if = ["(os == 'win' && processor == 'aarch64')"] # bug 1533819 ["test_bug303267.xhtml"] ["test_bug311007.xhtml"] ["test_bug321671.xhtml"] -skip-if = ["(os == 'mac' && !debug)"] # Bug 1784831 +skip-if = ["os == 'mac' && !debug"] # Bug 1784831 ["test_bug360511.xhtml"] -skip-if = ["(os == 'win' && processor == 'x86')"] +skip-if = ["os == 'win' && processor == 'x86'"] ["test_bug364461.xhtml"] -skip-if = ["(os == 'win' && processor == 'aarch64')"] # bug 1533814 ["test_bug396519.xhtml"] diff --git a/dom/base/test/browser.toml b/dom/base/test/browser.toml index 5f76559ab332..53a5a19f1c52 100644 --- a/dom/base/test/browser.toml +++ b/dom/base/test/browser.toml @@ -85,8 +85,7 @@ tags = "mcb" ["browser_force_process_selector.js"] skip-if = [ "verify", - "(os == 'win' && os_version == '10.0' && bits == 64 && asan)", - "(os == 'linux' && bits == 64 && os_version == '18.04' && asan)", # this only makes sense with e10s-multi , Bug 1651357 + "os == 'linux' && bits == 64 && os_version == '18.04' && asan", # this only makes sense with e10s-multi , Bug 1651357 ] ["browser_form_validity_popup_submit.js"] @@ -102,8 +101,8 @@ skip-if = ["fission"] # Fails with Fission, and we're unlikely to spend time to ["browser_multiple_popups.js"] skip-if = [ - "os == 'win' && !debug", - "os == 'mac' && !debug", # Bug 1505235, Bug 1661132 (osx) + "os == 'win' && !debug", # Bug 1505235 + "os == 'mac' && !debug", # Bug 1661132 (osx) "socketprocess_networking", ] support-files = ["browser_multiple_popups.html"] diff --git a/dom/canvas/test/webgl-mochitest/mochitest.toml b/dom/canvas/test/webgl-mochitest/mochitest.toml index 587c80df987a..c76e2773e078 100644 --- a/dom/canvas/test/webgl-mochitest/mochitest.toml +++ b/dom/canvas/test/webgl-mochitest/mochitest.toml @@ -173,7 +173,7 @@ skip-if = ["display == 'wayland'"] ["test_sab_with_webgl.html"] ["test_tex_large_uploads.html"] -skip-if = ["os == 'win' && debug && bits == 32"] # bug 1705863 +skip-if = ["win11_2009 && debug && bits == 32"] # bug 1705863 support-files = ["blank_15000x10000.png"] ["test_tex_pbo.html"] @@ -187,27 +187,27 @@ support-files = ["blank_15000x10000.png"] ["test_vertexattrib4f_update.html"] ["test_video_fastpath_mp4.html"] -skip-if = ["os == 'win' && bits == 32"] # No fast video path for h264 decoder (done in RDD, can't be read in content) +skip-if = ["win11_2009 && bits == 32"] # No fast video path for h264 decoder (done in RDD, can't be read in content) ["test_video_fastpath_theora.html"] skip-if = [ "os == 'linux'", "os == 'mac'", - "os == 'win' && bits == 32", # No fast video path for theora decoder (done in RDD, can't be read in content) + "win11_2009 && bits == 32", # No fast video path for theora decoder (done in RDD, can't be read in content) ] ["test_video_fastpath_vp8.html"] skip-if = [ "os == 'linux'", "os == 'mac'", - "os == 'win' && bits == 32", # No fast video path for theora decoder (done in RDD, can't be read in content) + "win11_2009 && bits == 32", # No fast video path for theora decoder (done in RDD, can't be read in content) ] ["test_video_fastpath_vp9.html"] skip-if = [ "os == 'linux'", "os == 'mac'", - "os == 'win' && bits == 32", # No fast video path for theora decoder (done in RDD, can't be read in content) + "win11_2009 && bits == 32", # No fast video path for theora decoder (done in RDD, can't be read in content) ] ["test_webgl2_alpha_luminance.html"] diff --git a/dom/indexedDB/test/browser.toml b/dom/indexedDB/test/browser.toml index 53b00e3d0370..749e5a38516a 100644 --- a/dom/indexedDB/test/browser.toml +++ b/dom/indexedDB/test/browser.toml @@ -11,7 +11,7 @@ support-files = [ ] ["browser_bug839193.js"] -skip-if = ["os == 'win' && bits == 32"] # Bug 1607975 +skip-if = ["win11_2009 && bits == 32"] # Bug 1607975 ["browser_forgetThisSite.js"] skip-if = ["verify"] diff --git a/dom/security/test/https-first/browser.toml b/dom/security/test/https-first/browser.toml index beb4164c66fd..0c63b8317d38 100644 --- a/dom/security/test/https-first/browser.toml +++ b/dom/security/test/https-first/browser.toml @@ -32,7 +32,6 @@ support-files = ["file_httpsfirst_speculative_connect.html"] support-files = ["file_mixed_content_console.html"] ["browser_mixed_content_download.js"] -skip-if = ["win10_2004 && debug"] # Bug 1723573 support-files = [ "download_page.html", "download_server.sjs", diff --git a/dom/security/test/https-only/browser.toml b/dom/security/test/https-only/browser.toml index 434e580aa359..1640223f9c7c 100644 --- a/dom/security/test/https-only/browser.toml +++ b/dom/security/test/https-only/browser.toml @@ -49,7 +49,7 @@ support-files = ["file_save_as.html"] support-files = ["file_user_gesture.html"] ["browser_websocket_exceptions.js"] -skip-if = ["toolkit == 'android'"] # WebSocket tests are not supported on Android Yet. Bug 1566168. +skip-if = ["os == 'android'"] # WebSocket tests are not supported on Android Yet. Bug 1566168. support-files = [ "file_websocket_exceptions.html", "file_websocket_exceptions_iframe.html", diff --git a/dom/security/test/mixedcontentblocker/browser.toml b/dom/security/test/mixedcontentblocker/browser.toml index ddcc437cc039..5b0b85cb0b04 100644 --- a/dom/security/test/mixedcontentblocker/browser.toml +++ b/dom/security/test/mixedcontentblocker/browser.toml @@ -30,7 +30,6 @@ support-files = ["file_mixed_content_auto_upgrade_display_console.html"] ["browser_test_mixed_content_download.js"] skip-if = [ - "win10_2004 && debug", # Bug 1723573 "win11_2009", # Bug 1784764 "os == 'linux' && !debug", # Bug 1784764 ] diff --git a/dom/tests/browser/browser.toml b/dom/tests/browser/browser.toml index efb93caf9162..772df67bbc06 100644 --- a/dom/tests/browser/browser.toml +++ b/dom/tests/browser/browser.toml @@ -151,7 +151,7 @@ support-files = ["focus_after_prompt.html"] ["browser_test_new_window_from_content.js"] tags = "openwindow" skip-if = [ - "toolkit == 'android'", + "os == 'android'", "os == 'linux' && debug", # see bug 1261495 for Linux debug time outs ] support-files = ["test_new_window_from_content_child.html"] diff --git a/dom/tests/mochitest/general/chrome.toml b/dom/tests/mochitest/general/chrome.toml index d2e0384619e9..35665404c1f3 100644 --- a/dom/tests/mochitest/general/chrome.toml +++ b/dom/tests/mochitest/general/chrome.toml @@ -3,7 +3,6 @@ skip-if = ["os == 'android'"] ["test_focusrings.xhtml"] support-files = ["file_focusrings.html"] -skip-if = ["toolkit == 'android'"] #TIMED_OUT ["test_innerScreen.xhtml"] @@ -14,6 +13,6 @@ support-files = [ "test_offsets.css", "test_offsets.js", ] -skip-if = ["(os == 'mac' && debug)"] #leaks Bug 1571583 +skip-if = ["os == 'mac' && debug"] #leaks Bug 1571583 ["test_spacetopagedown.html"] diff --git a/dom/webauthn/tests/browser/browser.toml b/dom/webauthn/tests/browser/browser.toml index dcf3098716cc..41dc82d6ee70 100644 --- a/dom/webauthn/tests/browser/browser.toml +++ b/dom/webauthn/tests/browser/browser.toml @@ -17,13 +17,11 @@ prefs = [ ["browser_abort_visibility.js"] skip-if = [ - "win10_2004", # Test not relevant on 1903+ "win11_2009", # Test not relevant on 1903+ ] ["browser_fido_appid_extension.js"] skip-if = [ - "win10_2004", # Test not relevant on 1903+ "win11_2009", # Test not relevant on 1903+ ] @@ -33,6 +31,5 @@ skip-if = [ ["browser_webauthn_prompts.js"] skip-if = [ - "win10_2004", # Test not relevant on 1903+ "win11_2009", # Test not relevant on 1903+ ] diff --git a/dom/workers/test/chrome.toml b/dom/workers/test/chrome.toml index 9ac20be1250c..0b2d68da3982 100644 --- a/dom/workers/test/chrome.toml +++ b/dom/workers/test/chrome.toml @@ -91,8 +91,7 @@ support-files = [ ["test_file.xhtml"] skip-if = [ "os == 'linux' && bits == 64 && debug", # Bug 1765445 - "os == 'mac' && os_version == '10.15' && !debug", # Bug 1765445 - "win10_2004 && !debug", # Bug 1765445 + "apple_catalina && !debug", # Bug 1765445 ] ["test_fileBlobPosting.xhtml"] diff --git a/editor/libeditor/tests/browser.toml b/editor/libeditor/tests/browser.toml index fe57653d59bf..ac18b6eefc5b 100644 --- a/editor/libeditor/tests/browser.toml +++ b/editor/libeditor/tests/browser.toml @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = ["toolkit == 'android'"] +skip-if = ["os == 'android'"] ["browser_bug527935.js"] support-files = [ @@ -8,4 +8,3 @@ support-files = [ ] ["browser_content_command_insert_text.js"] - diff --git a/gfx/layers/apz/test/mochitest/browser.toml b/gfx/layers/apz/test/mochitest/browser.toml index 80ba8b22ec1e..ef1a66b842e3 100644 --- a/gfx/layers/apz/test/mochitest/browser.toml +++ b/gfx/layers/apz/test/mochitest/browser.toml @@ -27,7 +27,7 @@ support-files = ["helper_content_response_timeout.html"] ["browser_test_group_fission.js"] skip-if = [ - "os == 'win' && bits == 32", # intermittent failures on win7/32, still run on win11/32 + "win11_2009 && bits == 32", # intermittent failures on on win11/32 "os == 'linux' && bits == 64", # Bug 1773830 ] support-files = [ diff --git a/gfx/layers/apz/test/mochitest/mochitest.toml b/gfx/layers/apz/test/mochitest/mochitest.toml index 96da9d77ffa2..bcbefbe54744 100644 --- a/gfx/layers/apz/test/mochitest/mochitest.toml +++ b/gfx/layers/apz/test/mochitest/mochitest.toml @@ -62,7 +62,8 @@ skip-if = ["os == 'android'"] # mouse events not supported on mobile ["test_group_hittest-2.html"] skip-if = [ "os == 'android'", # mouse events not supported on mobile - "os == 'win' && (bits == 32 || asan)", + "win11_2009 && bits == 32", + "win11_2009 && asan", "os == 'linux' && asan", # stack is not large enough for the test "display == 'wayland' && os_version == '22.04'", # Bug 1857059 "http3", @@ -72,7 +73,8 @@ skip-if = [ ["test_group_hittest-3.html"] skip-if = [ "os == 'android'", # mouse events not supported on mobile - "os == 'win' && (bits == 32 || asan)", + "win11_2009 && bits == 32", + "win11_2009 && asan", "http3", "http2", ] diff --git a/layout/base/tests/chrome/chrome.toml b/layout/base/tests/chrome/chrome.toml index adf2a7ea1525..358de3d5cc9a 100644 --- a/layout/base/tests/chrome/chrome.toml +++ b/layout/base/tests/chrome/chrome.toml @@ -153,10 +153,7 @@ tags = "openwindow" ["test_printer_default_settings.html"] ["test_printpreview.xhtml"] -skip-if = [ - "os == 'linux' && bits == 32", # Disabled on Linux32 for bug 1278957 - "verify && os == 'win'", -] +skip-if = ["verify && os == 'win'"] ["test_printpreview_bug396024.xhtml"] skip-if = ["verify && os == 'win'"] diff --git a/layout/base/tests/mochitest.toml b/layout/base/tests/mochitest.toml index 6f6ae53145d6..1fe7885ac448 100644 --- a/layout/base/tests/mochitest.toml +++ b/layout/base/tests/mochitest.toml @@ -201,7 +201,7 @@ support-files = ["bug1093686_inner.html"] skip-if = [ "os == 'android'", # android does not have clickable scrollbars "os == 'mac'", # mac does not have scrollbar down and up buttons - "toolkit == 'gtk'", # gtk may or may not have scrollbar buttons depending on theme + "os == 'linux' && os_version == '18.04'", # gtk may or may not have scrollbar buttons depending on theme ] ["test_bug1153130.html"] diff --git a/layout/generic/test/mochitest.toml b/layout/generic/test/mochitest.toml index 9839e0dc9641..5c06c90eb7da 100644 --- a/layout/generic/test/mochitest.toml +++ b/layout/generic/test/mochitest.toml @@ -222,7 +222,7 @@ skip-if = [ ["test_movement_by_words.html"] # Disable the caret movement by word test on Linux because the shortcut keys # are defined in system level. So, it depends on the environment. -skip-if = ["toolkit == 'gtk'"] +skip-if = ["os == 'linux' && os_version == '18.04'"] ["test_overflow_event.html"] diff --git a/layout/inspector/tests/chrome/chrome.toml b/layout/inspector/tests/chrome/chrome.toml index 8b8098ebb69a..b254fa7ed69a 100644 --- a/layout/inspector/tests/chrome/chrome.toml +++ b/layout/inspector/tests/chrome/chrome.toml @@ -27,9 +27,8 @@ support-files = [ ["test_fontVariationsAPI.xhtml"] skip-if = [ - "os == 'win' && bits == 32", - "os == 'linux' && bits == 32", # bug 1456855 - "os == 'mac'", # bug 1456856 + "win11_2009 && bits == 32", + "apple_catalina", # bug 1456856 ] support-files = ["test_fontVariationsAPI.css"] diff --git a/layout/xul/test/chrome.toml b/layout/xul/test/chrome.toml index 30fef4ed893c..983f87c74634 100644 --- a/layout/xul/test/chrome.toml +++ b/layout/xul/test/chrome.toml @@ -46,10 +46,8 @@ skip-if = ["os == 'linux'"] # No native mousedown event on Linux ["test_resizer_incontent.xhtml"] ["test_splitter.xhtml"] -skip-if = ["toolkit == 'android'"] # no XUL theme ["test_splitter_sibling.xhtml"] -skip-if = ["toolkit == 'android'"] # no XUL theme ["test_submenuClose.xhtml"] diff --git a/netwerk/test/mochitests/mochitest.toml b/netwerk/test/mochitests/mochitest.toml index 2bfcdb9e6e91..a636e059c215 100644 --- a/netwerk/test/mochitests/mochitest.toml +++ b/netwerk/test/mochitests/mochitest.toml @@ -95,7 +95,7 @@ support-files = ["test_accept_header.sjs"] ["test_arraybufferinputstream_large.html"] # Large ArrayBuffers not supported on 32-bit. TSan shadow memory causes OOMs. skip-if = [ - "bits == 32", + "win11_2009 && bits == 32", "tsan", "asan", ] diff --git a/testing/cppunittest.toml b/testing/cppunittest.toml index 1dccfcda191f..62791f2b004b 100644 --- a/testing/cppunittest.toml +++ b/testing/cppunittest.toml @@ -68,7 +68,7 @@ run-if = ["os == 'win'"] ["TestIATPatcher"] run-if = ["os == 'win'"] -skip-if = ["bits == 32"] # fails on windows10x32 +skip-if = ["win11_2009 && bits == 32"] # fails on windows10x32 ["TestIntegerPrintfMacros"] diff --git a/testing/mochitest/tests/browser/browser.toml b/testing/mochitest/tests/browser/browser.toml index 9d286d5ac1ca..936763037027 100644 --- a/testing/mochitest/tests/browser/browser.toml +++ b/testing/mochitest/tests/browser/browser.toml @@ -16,9 +16,6 @@ skip-if = [ https_first_disabled = true ['browser_document_builder_sjs.js'] -skip-if = [ - "os == 'win' && os_version == '6.1'", # Skip on Azure - frequent failure -] ['browser_fail.js'] skip-if = [ diff --git a/testing/mozbase/manifestparser/tests/filter-example.toml b/testing/mozbase/manifestparser/tests/filter-example.toml index 3fb8c996afea..044470e4cc0a 100644 --- a/testing/mozbase/manifestparser/tests/filter-example.toml +++ b/testing/mozbase/manifestparser/tests/filter-example.toml @@ -16,5 +16,5 @@ skip-if = [ "os == 'win'", ] fail-if = [ - "toolkit == 'cocoa'", + "os == 'mac'", ] diff --git a/testing/mozbase/manifestparser/tests/test_testmanifest.py b/testing/mozbase/manifestparser/tests/test_testmanifest.py index 691c25b1e1b7..d51ec6c0880e 100644 --- a/testing/mozbase/manifestparser/tests/test_testmanifest.py +++ b/testing/mozbase/manifestparser/tests/test_testmanifest.py @@ -40,10 +40,10 @@ class TestTestManifest(unittest.TestCase): self.assertEqual([i["name"] for i in manifest.active_tests()], ["fleem"]) # You should be able to expect failures: - last = manifest.active_tests(exists=False, toolkit="gtk")[-1] + last = manifest.active_tests(exists=False, os="linux")[-1] self.assertEqual(last["name"], "linuxtest") self.assertEqual(last["expected"], "pass") - last = manifest.active_tests(exists=False, toolkit="cocoa")[-1] + last = manifest.active_tests(exists=False, os="mac")[-1] self.assertEqual(last["expected"], "fail") def test_missing_paths_toml(self): diff --git a/testing/mozbase/mozinfo/mozinfo/mozinfo.py b/testing/mozbase/mozinfo/mozinfo/mozinfo.py index b858cce7e7cf..bb04be54c83f 100755 --- a/testing/mozbase/mozinfo/mozinfo/mozinfo.py +++ b/testing/mozbase/mozinfo/mozinfo/mozinfo.py @@ -128,10 +128,6 @@ info["apple_catalina"] = False if info["os"] == "mac" and float(os_version) == 10.15: info["apple_catalina"] = True -info["win10_2004"] = False -if info["os"] == "win" and version == "10.0.19041": - info["win10_2004"] = True - info["win10_2009"] = False if info["os"] == "win" and version == "10.0.19045": info["win10_2009"] = True diff --git a/testing/web-platform/fissionregressions.py b/testing/web-platform/fissionregressions.py index cc9643347b88..3466d936eff7 100644 --- a/testing/web-platform/fissionregressions.py +++ b/testing/web-platform/fissionregressions.py @@ -60,7 +60,6 @@ run_infos = { "sessionHistoryInParent": True, "swgl": False, "privateBrowsing": False, - "win10_2004": False, "win11_2009": False, "domstreams": True, "isolated_process": False, @@ -115,7 +114,6 @@ run_infos = { "sessionHistoryInParent": False, "swgl": False, "privateBrowsing": False, - "win10_2004": False, "win11_2009": False, "domstreams": True, "isolated_process": False, @@ -169,7 +167,6 @@ run_infos = { "sessionHistoryInParent": False, "swgl": False, "privateBrowsing": False, - "win10_2004": False, "win11_2009": False, "domstreams": True, "isolated_process": False, diff --git a/testing/web-platform/meta/IndexedDB/idb-explicit-commit.any.js.ini b/testing/web-platform/meta/IndexedDB/idb-explicit-commit.any.js.ini index 264888bcc8f9..9192799a4da5 100644 --- a/testing/web-platform/meta/IndexedDB/idb-explicit-commit.any.js.ini +++ b/testing/web-platform/meta/IndexedDB/idb-explicit-commit.any.js.ini @@ -1,6 +1,4 @@ [idb-explicit-commit.any.html] - disabled: - if win10_2004 and ccov: https://bugzilla.mozilla.org/show_bug.cgi?id=1733368 expected: if (os == "win") and debug and (processor == "x86_64") and swgl: [ERROR, OK, TIMEOUT] if (os == "win") and debug and (processor == "x86_64") and not swgl: [OK, ERROR, TIMEOUT] diff --git a/testing/web-platform/meta/IndexedDB/idbindex-query-exception-order.html.ini b/testing/web-platform/meta/IndexedDB/idbindex-query-exception-order.html.ini index cb2072f144e2..2068d8d21b62 100644 --- a/testing/web-platform/meta/IndexedDB/idbindex-query-exception-order.html.ini +++ b/testing/web-platform/meta/IndexedDB/idbindex-query-exception-order.html.ini @@ -1,6 +1,4 @@ [idbindex-query-exception-order.html] - disabled: - if win10_2004 and ccov: https://bugzilla.mozilla.org/show_bug.cgi?id=1733368 expected: if (os == "win") and not debug and (processor == "x86"): [OK, TIMEOUT] if (os == "win") and not debug and (processor == "x86_64"): [OK, TIMEOUT] diff --git a/testing/web-platform/meta/IndexedDB/idbindex_getAll.html.ini b/testing/web-platform/meta/IndexedDB/idbindex_getAll.html.ini index 7a0054b2b478..288e21acfd82 100644 --- a/testing/web-platform/meta/IndexedDB/idbindex_getAll.html.ini +++ b/testing/web-platform/meta/IndexedDB/idbindex_getAll.html.ini @@ -1,6 +1,4 @@ [idbindex_getAll.html] - disabled: - if win10_2004 and ccov: https://bugzilla.mozilla.org/show_bug.cgi?id=1733368 expected: if (os == "win") and not debug and (processor == "x86"): [OK, TIMEOUT] if (os == "win") and not debug and (processor == "x86_64"): [OK, TIMEOUT] diff --git a/testing/web-platform/meta/IndexedDB/idbindex_getAllKeys.html.ini b/testing/web-platform/meta/IndexedDB/idbindex_getAllKeys.html.ini index 107696924189..fc28e8dbc988 100644 --- a/testing/web-platform/meta/IndexedDB/idbindex_getAllKeys.html.ini +++ b/testing/web-platform/meta/IndexedDB/idbindex_getAllKeys.html.ini @@ -1,6 +1,4 @@ [idbindex_getAllKeys.html] - disabled: - if win10_2004 and ccov: https://bugzilla.mozilla.org/show_bug.cgi?id=1733368 expected: if (os == "win") and not swgl and not debug and (processor == "x86"): [OK, TIMEOUT] if (os == "win") and not swgl and not debug and (processor == "x86_64"): [OK, TIMEOUT] diff --git a/testing/web-platform/meta/IndexedDB/idbobjectstore-query-exception-order.html.ini b/testing/web-platform/meta/IndexedDB/idbobjectstore-query-exception-order.html.ini index b5461f43d07a..cb9f6bd3b14b 100644 --- a/testing/web-platform/meta/IndexedDB/idbobjectstore-query-exception-order.html.ini +++ b/testing/web-platform/meta/IndexedDB/idbobjectstore-query-exception-order.html.ini @@ -1,6 +1,4 @@ [idbobjectstore-query-exception-order.html] - disabled: - if win10_2004 and ccov: https://bugzilla.mozilla.org/show_bug.cgi?id=1733368 expected: if (os == "win") and not debug: [OK, TIMEOUT] [IDBObjectStore.openCursor exception order: TransactionInactiveError vs. DataError] diff --git a/testing/web-platform/meta/IndexedDB/structured-clone.any.js.ini b/testing/web-platform/meta/IndexedDB/structured-clone.any.js.ini index f8d72d8e5777..343dc96d6740 100644 --- a/testing/web-platform/meta/IndexedDB/structured-clone.any.js.ini +++ b/testing/web-platform/meta/IndexedDB/structured-clone.any.js.ini @@ -33,7 +33,6 @@ [FileList: [object FileList\]] expected: - if win10_2004 and ccov: [TIMEOUT, NOTRUN, FAIL] if (os == "android") and debug and not swgl: [NOTRUN, FAIL] if (os == "linux") and swgl and not fission: [NOTRUN, FAIL] if (os == "mac") and not debug: [NOTRUN, FAIL] diff --git a/testing/web-platform/meta/content-security-policy/reporting/report-frame-ancestors-with-x-frame-options.sub.html.ini b/testing/web-platform/meta/content-security-policy/reporting/report-frame-ancestors-with-x-frame-options.sub.html.ini index 2c9a8233b0ee..b8409a65c2b2 100644 --- a/testing/web-platform/meta/content-security-policy/reporting/report-frame-ancestors-with-x-frame-options.sub.html.ini +++ b/testing/web-platform/meta/content-security-policy/reporting/report-frame-ancestors-with-x-frame-options.sub.html.ini @@ -3,4 +3,3 @@ expected: if os == "mac": FAIL if os == "linux": FAIL - if win10_2004: FAIL diff --git a/testing/web-platform/meta/css/filter-effects/filter-contrast-002.html.ini b/testing/web-platform/meta/css/filter-effects/filter-contrast-002.html.ini index 5b7405dc774e..31045785c162 100644 --- a/testing/web-platform/meta/css/filter-effects/filter-contrast-002.html.ini +++ b/testing/web-platform/meta/css/filter-effects/filter-contrast-002.html.ini @@ -1,5 +1,4 @@ [filter-contrast-002.html] max-asserts: 2 expected: - if win10_2004 and (processor == "x86_64") and not swgl: FAIL if (os == "win") and (processor == "x86_64") and not swgl: FAIL diff --git a/testing/web-platform/meta/css/filter-effects/svg-shorthand-hue-rotate-001.html.ini b/testing/web-platform/meta/css/filter-effects/svg-shorthand-hue-rotate-001.html.ini index bbc2a4be253d..4e92bb67bc53 100644 --- a/testing/web-platform/meta/css/filter-effects/svg-shorthand-hue-rotate-001.html.ini +++ b/testing/web-platform/meta/css/filter-effects/svg-shorthand-hue-rotate-001.html.ini @@ -1,4 +1,3 @@ [svg-shorthand-hue-rotate-001.html] expected: - if win10_2004 and (processor == "x86_64") and not swgl: FAIL if (os == "win") and (processor == "x86_64") and not swgl: FAIL diff --git a/testing/web-platform/meta/fetch/metadata/embed.https.sub.tentative.html.ini b/testing/web-platform/meta/fetch/metadata/embed.https.sub.tentative.html.ini index 1f9801e592b8..4cb5485e046d 100644 --- a/testing/web-platform/meta/fetch/metadata/embed.https.sub.tentative.html.ini +++ b/testing/web-platform/meta/fetch/metadata/embed.https.sub.tentative.html.ini @@ -2,7 +2,6 @@ expected: if os == "linux": TIMEOUT if os == "mac": TIMEOUT - if win10_2004: TIMEOUT [Navigate to same-site embed: sec-fetch-dest] expected: FAIL @@ -10,19 +9,16 @@ expected: if os == "mac": NOTRUN if os == "linux": NOTRUN - if win10_2004: NOTRUN [Wrapper: cross-site embed] expected: if os == "mac": NOTRUN if os == "linux": NOTRUN - if win10_2004: NOTRUN [Wrapper: Navigate to same-site embed] expected: if os == "mac": NOTRUN if os == "linux": NOTRUN - if win10_2004: NOTRUN [Navigate to cross-site embed: sec-fetch-dest] expected: FAIL @@ -34,11 +30,9 @@ expected: if os == "mac": NOTRUN if os == "linux": NOTRUN - if win10_2004: NOTRUN [Wrapper: Navigate to same-origin embed] expected: if os == "mac": TIMEOUT if os == "linux": TIMEOUT - if win10_2004: TIMEOUT diff --git a/testing/web-platform/meta/fetch/range/sw.https.window.js.ini b/testing/web-platform/meta/fetch/range/sw.https.window.js.ini index 8b81b73f7e22..4a5e12a4ccdc 100644 --- a/testing/web-platform/meta/fetch/range/sw.https.window.js.ini +++ b/testing/web-platform/meta/fetch/range/sw.https.window.js.ini @@ -2,7 +2,6 @@ prefs: [browser.opaqueResponseBlocking:true] disabled: if asan and (os == "linux") and (bits == 64): https://bugzilla.mozilla.org/show_bug.cgi?id=1509373 - if win10_2004 and debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1746958 max-asserts: 2 expected: TIMEOUT [Ranged response not allowed following no-cors ranged request] diff --git a/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html.ini b/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html.ini index fedfcd13754e..71407fb46c3e 100644 --- a/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html.ini +++ b/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html.ini @@ -1,5 +1,4 @@ [2d.pattern.paint.repeat.basic.html] disabled: if (os == "mac") and (os_version == "10.15"): https://bugzilla.mozilla.org/show_bug.cgi?id=1753270 - if win10_2004: https://bugzilla.mozilla.org/show_bug.cgi?id=1753270 expected: [OK, ERROR] diff --git a/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html.ini b/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html.ini index e79e11bc5248..5e48f1a14e2e 100644 --- a/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html.ini +++ b/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html.ini @@ -1,5 +1,4 @@ [2d.pattern.paint.repeat.outside.html] disabled: if (os == "mac") and (os_version == "10.15"): https://bugzilla.mozilla.org/show_bug.cgi?id=1753270 - if win10_2004: https://bugzilla.mozilla.org/show_bug.cgi?id=1753270 expected: [OK, ERROR] diff --git a/testing/web-platform/meta/mathml/relations/css-styling/color-001.html.ini b/testing/web-platform/meta/mathml/relations/css-styling/color-001.html.ini index 0e898f6b66c1..1dfbc4427f91 100644 --- a/testing/web-platform/meta/mathml/relations/css-styling/color-001.html.ini +++ b/testing/web-platform/meta/mathml/relations/css-styling/color-001.html.ini @@ -1,7 +1,5 @@ [color-001.html] expected: - if win10_2004 and ccov and swgl: PASS - if win10_2004 and ccov: FAIL if win11_2009 and ccov: FAIL if win11_2009 and bits == 32: PASS if (os == "win") and (processor == "x86_64") and debug and not swgl: [FAIL, PASS] diff --git a/testing/web-platform/meta/mathml/relations/css-styling/color-002.html.ini b/testing/web-platform/meta/mathml/relations/css-styling/color-002.html.ini index 1a3ffc6d87fc..03fad99b01b6 100644 --- a/testing/web-platform/meta/mathml/relations/css-styling/color-002.html.ini +++ b/testing/web-platform/meta/mathml/relations/css-styling/color-002.html.ini @@ -1,7 +1,5 @@ [color-002.html] expected: - if win10_2004 and ccov and swgl: PASS - if win10_2004 and ccov: FAIL if win11_2009 and ccov: FAIL if win11_2009 and bits == 32: PASS if (os == "win") and (processor == "x86_64") and debug and not swgl: [FAIL, PASS] diff --git a/testing/web-platform/meta/mathml/relations/css-styling/color-003.html.ini b/testing/web-platform/meta/mathml/relations/css-styling/color-003.html.ini index 65ac6b8170fb..766c566b286c 100644 --- a/testing/web-platform/meta/mathml/relations/css-styling/color-003.html.ini +++ b/testing/web-platform/meta/mathml/relations/css-styling/color-003.html.ini @@ -1,6 +1,5 @@ [color-003.html] expected: - if win10_2004 and ccov: FAIL if win11_2009 and ccov: FAIL if win11_2009 and bits == 32: PASS if (os == "win") and (processor == "x86_64") and debug and not swgl: [FAIL, PASS] diff --git a/toolkit/components/backgroundhangmonitor/tests/xpcshell.toml b/toolkit/components/backgroundhangmonitor/tests/xpcshell.toml index c588f622c30c..d0ea28c83c45 100644 --- a/toolkit/components/backgroundhangmonitor/tests/xpcshell.toml +++ b/toolkit/components/backgroundhangmonitor/tests/xpcshell.toml @@ -7,7 +7,7 @@ skip-if = [ "os == 'android'", "release_or_beta", "os == 'mac'", # Bug 1417723 - "os == 'win' && bits == 32", # Bug 1760134 + "win11_2009 && bits == 32", # Bug 1760134 "os == 'win' && msix", ] support-files = ["child_cause_hang.js"] diff --git a/toolkit/components/backgroundtasks/tests/browser/browser.toml b/toolkit/components/backgroundtasks/tests/browser/browser.toml index 8af91d0c230e..80bc7282946d 100644 --- a/toolkit/components/backgroundtasks/tests/browser/browser.toml +++ b/toolkit/components/backgroundtasks/tests/browser/browser.toml @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = ["toolkit == 'android'"] +skip-if = ["os == 'android'"] head = "head.js" ["browser_backgroundtask_specific_pref.js"] diff --git a/toolkit/components/httpsonlyerror/tests/browser/browser.toml b/toolkit/components/httpsonlyerror/tests/browser/browser.toml index 5bfaddbe1194..5bbad4822671 100644 --- a/toolkit/components/httpsonlyerror/tests/browser/browser.toml +++ b/toolkit/components/httpsonlyerror/tests/browser/browser.toml @@ -9,7 +9,7 @@ support-files = ["file_errorpage_timeout_server.sjs"] ["browser_errorpage_www_suggestion.js"] support-files = ["file_errorpage_www_suggestion.html"] -skip-if = ["toolkit == 'android'"] # no https-only errorpage support in android +skip-if = ["os == 'android'"] # no https-only errorpage support in android ["browser_exception.js"] support-files = ["file_upgrade_insecure_server.sjs"] diff --git a/toolkit/components/nimbus/test/browser/browser.toml b/toolkit/components/nimbus/test/browser/browser.toml index 1a70bba6bc2b..b511e1631f3b 100644 --- a/toolkit/components/nimbus/test/browser/browser.toml +++ b/toolkit/components/nimbus/test/browser/browser.toml @@ -4,7 +4,7 @@ prefs = [ "app.normandy.run_interval_seconds=0", # This turns off the update interval for fetching recipes from Remote Settings ] skip-if = [ - "toolkit == 'android'", + "os == 'android'", "appname == 'thunderbird'", ] diff --git a/toolkit/components/prompts/test/chrome.toml b/toolkit/components/prompts/test/chrome.toml index f90c8b7dd416..55f2617c0d87 100644 --- a/toolkit/components/prompts/test/chrome.toml +++ b/toolkit/components/prompts/test/chrome.toml @@ -6,9 +6,9 @@ support-files = [ ["test_modal_prompts.html"] skip-if = [ - "toolkit == 'android'", #android: TIMED_OUT + "os == 'android'", #android: TIMED_OUT "os == 'linux' && (debug || asan || tsan)", ] ["test_modal_select.html"] -skip-if = ["toolkit == 'android'"] #android: TIMED_OUT +skip-if = ["os == 'android'"] #android: TIMED_OUT diff --git a/toolkit/components/telemetry/tests/unit/xpcshell.toml b/toolkit/components/telemetry/tests/unit/xpcshell.toml index 5de49d719b6a..2dbaaff1a316 100644 --- a/toolkit/components/telemetry/tests/unit/xpcshell.toml +++ b/toolkit/components/telemetry/tests/unit/xpcshell.toml @@ -167,7 +167,7 @@ skip-if = [ "release_or_beta", "apple_catalina", # Bug 1713329 "apple_silicon", # bug 1707747 - "os == 'win' && bits == 32 && !debug", # Bug 1781452 + "win11_2009 && bits == 32 && !debug", # Bug 1781452 "os == 'linux' && !debug", # Bug 1781452 ] run-sequentially = "very high failure rate in parallel" diff --git a/toolkit/components/windowcreator/test/chrome.toml b/toolkit/components/windowcreator/test/chrome.toml index b9fc174fd612..0fdc8250e0ff 100644 --- a/toolkit/components/windowcreator/test/chrome.toml +++ b/toolkit/components/windowcreator/test/chrome.toml @@ -11,4 +11,4 @@ support-files = [ ["test_bug1192654.html"] ["test_bug449141.html"] -skip-if = ["toolkit == 'android'"] +skip-if = ["os == 'android'"] diff --git a/toolkit/content/tests/chrome/chrome.toml b/toolkit/content/tests/chrome/chrome.toml index 09df86135818..70fa12c4b694 100644 --- a/toolkit/content/tests/chrome/chrome.toml +++ b/toolkit/content/tests/chrome/chrome.toml @@ -59,8 +59,6 @@ prefs = [ ["test_arrowpanel.xhtml"] skip-if = [ "os == 'win' && verify", - "debug && os == 'win' && bits == 32", # Bug 1546256 - "win10_2004", # Bug 1727507 "win10_2009", # Bug 1727507 "win11_2009", # Bug 1797751 ] @@ -76,7 +74,7 @@ skip-if = [ ["test_autocomplete_emphasis.xhtml"] ["test_autocomplete_mac_caret.xhtml"] -skip-if = ["toolkit != 'cocoa'"] +run-if = ["os == 'mac'"] ["test_autocomplete_placehold_last_complete.xhtml"] @@ -87,10 +85,13 @@ skip-if = [ ["test_browser_drop.xhtml"] ["test_bug1048178.xhtml"] -skip-if = ["toolkit == 'cocoa'"] +skip-if = ["apple_catalina"] ["test_bug263683.xhtml"] -skip-if = ["debug && (os == 'win' || os == 'linux')"] +skip-if = [ + "debug && os == 'linux'", + "debug && os == 'win'", +] ["test_bug304188.xhtml"] skip-if = ["true"] @@ -131,7 +132,7 @@ support-files = ["bug451540_window.xhtml"] ["test_bug562554.xhtml"] ["test_bug624329.xhtml"] -fail-if = ["(os == 'linux' && os_version == '18.04')"] # Bug 1600194 +fail-if = ["os == 'linux' && os_version == '18.04'"] # Bug 1600194 ["test_bug792324.xhtml"] @@ -139,7 +140,7 @@ fail-if = ["(os == 'linux' && os_version == '18.04')"] # Bug 1600194 ["test_chromemargin.xhtml"] support-files = "window_chromemargin.xhtml" -skip-if = ["toolkit == 'cocoa'"] +skip-if = ["apple_catalina"] ["test_closemenu_attribute.xhtml"] @@ -148,7 +149,7 @@ skip-if = ["toolkit == 'cocoa'"] ["test_contextmenu_rtl.xhtml"] ["test_cursorsnap.xhtml"] -disabled = true # INI file had 'disabled = ' +disabled = true #skip-if = os != 'win' support-files = [ "window_cursorsnap_dialog.xhtml", @@ -172,7 +173,7 @@ support-files = [ ["test_editor_for_input_with_autocomplete.html"] ["test_findbar.xhtml"] -skip-if = ["os == 'mac' && os_version == '10.15'"] # macosx1014/15 due to 1550078 +skip-if = ["apple_catalina"] # macosx1014/15 due to 1550078 ["test_findbar_entireword.xhtml"] @@ -241,10 +242,13 @@ support-files = [ support-files = ["window_navigate_persist.html"] ["test_notificationbox.xhtml"] -skip-if = ["(os == 'linux' && debug) || (os == 'win')"] # Bug 1429649 +skip-if = [ + "os == 'linux' && debug", # Bug 1429649 + "os == 'win'", # Bug 1429649 +] ["test_panel.xhtml"] -skip-if = ["os == 'mac' && os_version == '10.15'"] # macosx1014 due to 1550078 +skip-if = ["apple_catalina"] # macosx1014 due to 1550078 ["test_panel_anchoradjust.xhtml"] @@ -252,7 +256,7 @@ skip-if = ["os == 'mac' && os_version == '10.15'"] # macosx1014 due to 1550078 # textboxes and lists only, so skip this test on Mac ["test_panel_focus.xhtml"] support-files = "window_panel_focus.xhtml" -skip-if = ["toolkit == 'cocoa'"] +skip-if = ["apple_catalina"] ["test_panel_hover_menu.xhtml"] @@ -267,14 +271,14 @@ skip-if = ["os == 'linux'"] # 1167694 ["test_popup_attribute.xhtml"] skip-if = [ - "os == 'linux' && asan", # Bug 1582610 - "os == 'mac' && debug", # Bug 1281360 + "os == 'linux' && os_version == '18.04' && asan", # Bug 1582610 + "apple_catalina && debug", # Bug 1281360 ] ["test_popup_button.xhtml"] skip-if = [ - "os == 'linux' && asan", # Bug 1582610 - "os == 'mac' && debug", # Bug 1281360 + "os == 'linux' && os_version == '18.04' && asan", # Bug 1582610 + "apple_catalina && debug", # Bug 1281360 ] ["test_popup_coords.xhtml"] @@ -332,7 +336,7 @@ support-files = ["window_preferences_onsyncfrompreference.xhtml"] ["test_tooltip.xhtml"] skip-if = [ - "os == 'mac'", # Bug 1141245, frequent timeouts on OSX 10.14, Windows + "apple_catalina", # Bug 1141245, frequent timeouts on OSX 10.14, Windows "os == 'win'", # Bug 1141245, frequent timeouts on OSX 10.14, Windows ] diff --git a/toolkit/content/tests/widgets/chrome.toml b/toolkit/content/tests/widgets/chrome.toml index 815a3e1084d9..af2c778947d7 100644 --- a/toolkit/content/tests/widgets/chrome.toml +++ b/toolkit/content/tests/widgets/chrome.toml @@ -47,7 +47,10 @@ skip-if = ["os == 'mac'"] ["test_panel_list_min_width_from_anchor.html"] ["test_popupanchor.xhtml"] -skip-if = ["os == 'linux' || (verify && (os == 'win'))"] # Bug 1335894 perma-fail on linux 16.04 +skip-if = [ + "os == 'linux' && os_version == '18.04'", # Bug 1335894 perma-fail on linux 16.04 + "verify && os == 'win'", +] ["test_popupreflows.xhtml"] @@ -59,7 +62,7 @@ support-files = [ "video.ogg", ] skip-if = [ - "toolkit == 'android'", + "os == 'android'", "os == 'linux' && debug", # Bug 1765783 ] ["test_videocontrols_onclickplay.html"] diff --git a/toolkit/mozapps/extensions/test/browser/browser.toml b/toolkit/mozapps/extensions/test/browser/browser.toml index d1a98ce0fe8b..a8274a2dee97 100644 --- a/toolkit/mozapps/extensions/test/browser/browser.toml +++ b/toolkit/mozapps/extensions/test/browser/browser.toml @@ -45,7 +45,6 @@ generated-files = [ skip-if = [ "os == 'linux' && asan", # Bug 1713895 - new Fission platform triage - "os == 'win' && os_version == '6.1'", # Bug 1717250 ] prefs = [ "dom.webmidi.enabled=true", diff --git a/widget/tests/browser/browser.toml b/widget/tests/browser/browser.toml index 5c1d7bb5ab6a..3f5fff9c5d48 100644 --- a/widget/tests/browser/browser.toml +++ b/widget/tests/browser/browser.toml @@ -79,7 +79,7 @@ support-files = ["helper_scrollbar_colors.html"] ["browser_test_swipe_gesture.js"] skip-if = [ - "os == 'win' && bits == 32 && !debug", # Bug 1759422 + "win11_2009 && bits == 32 && !debug", # Bug 1759422 "verify", # Bug 1800022 "os == 'linux'", # Bug 1784772 ] @@ -88,4 +88,3 @@ support-files = [ "!/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js", "!/gfx/layers/apz/test/mochitest/apz_test_utils.js", ] - diff --git a/widget/tests/chrome.toml b/widget/tests/chrome.toml index 815db1736892..08d02d3c36ea 100644 --- a/widget/tests/chrome.toml +++ b/widget/tests/chrome.toml @@ -10,13 +10,13 @@ support-files = [ # Privacy relevant ["test_bug1123480.xhtml"] -skip-if = ["os == 'win' && bits == 32"] +skip-if = ["win11_2009 && bits == 32"] ["test_bug343416.xhtml"] skip-if = ["debug"] ["test_bug428405.xhtml"] -skip-if = ["toolkit != 'cocoa'"] # Cocoa widget test +run-if = ["os == 'mac'"] # Cocoa widget test ["test_bug429954.xhtml"] support-files = ["window_bug429954.xhtml"] @@ -24,31 +24,31 @@ support-files = ["window_bug429954.xhtml"] ["test_bug444800.xhtml"] ["test_bug466599.xhtml"] -skip-if = ["toolkit != 'cocoa'"] # Cocoa widget test +run-if = ["os == 'mac'"] # Cocoa widget test ["test_bug478536.xhtml"] skip-if = ["true"] # Bug 561929 support-files = ["window_bug478536.xhtml"] ["test_bug485118.xhtml"] -skip-if = ["toolkit != 'cocoa'"] # Cocoa widget test +run-if = ["os == 'mac'"] # Cocoa widget test ["test_bug517396.xhtml"] -skip-if = ["(verify && (os == 'win'))"] +skip-if = ["verify && os == 'win'"] ["test_bug522217.xhtml"] tags = "fullscreen" -skip-if = ["toolkit != 'cocoa'"] # Cocoa widget test +run-if = ["os == 'mac'"] # Cocoa widget test support-files = ["window_bug522217.xhtml"] ["test_bug538242.xhtml"] support-files = ["window_bug538242.xhtml"] ["test_bug565392.html"] -skip-if = ["toolkit != 'windows'"] +run-if = ["os == 'win'"] ["test_bug586713.xhtml"] -skip-if = ["toolkit != 'cocoa'"] # Cocoa widget test +run-if = ["os == 'mac'"] # Cocoa widget test support-files = ["bug586713_window.xhtml"] ["test_bug593307.xhtml"] @@ -59,12 +59,10 @@ support-files = [ ["test_bug596600.xhtml"] support-files = "file_bug596600.html" -skip-if = [ - "toolkit != 'cocoa'", # Cocoa widget test -] +run-if = ["os == 'mac'"] # Cocoa widget test ["test_bug673301.xhtml"] -skip-if = ["toolkit != 'cocoa'"] # Cocoa widget test +run-if = ["os == 'mac'"] # Cocoa widget test ["test_bug760802.xhtml"] @@ -128,67 +126,71 @@ support-files = ["window_imestate_iframes.html"] support-files = ["file_input_events_on_deactive_window.html"] ["test_key_event_counts.xhtml"] -skip-if = ["toolkit != 'cocoa'"] # Cocoa widget test +run-if = ["os == 'mac'"] # Cocoa widget test ["test_keycodes.xhtml"] ["test_mouse_scroll.xhtml"] -skip-if = ["toolkit != 'windows'"] # Windows widget test +run-if = ["os == 'win'"] # windows widget test support-files = [ "window_mouse_scroll_win.html", "window_mouse_scroll_win_2.html", ] ["test_native_key_bindings_mac.html"] +run-if = ["os == 'mac'"] # Cocoa widget test skip-if = [ - "toolkit != 'cocoa'", # Cocoa widget test "verify", ] ["test_native_menus.xhtml"] -skip-if = ["toolkit != 'cocoa'"] # Cocoa widget test +run-if = ["os == 'mac'"] # Cocoa widget test support-files = ["native_menus_window.xhtml"] ["test_panel_mouse_coords.xhtml"] -skip-if = ["toolkit == 'windows'"] # bug 1009955 +skip-if = ["os == 'win'"] # bug 1009955 ["test_platform_colors.xhtml"] skip-if = ["true"] # Bug 1207190 ["test_position_on_resize.xhtml"] skip-if = [ - "verify && (os == 'win')", - "(os == 'linux' && bits == 64)", # Bug 1616760 + "verify && os == 'win'", + "os == 'linux' && bits == 64", # Bug 1616760 ] ["test_secure_input.html"] +run-if = ["os == 'mac'"] # Cocoa widget test support-files = ["file_secure_input.html"] -skip-if = ["toolkit != 'cocoa'"] # Cocoa widget test ["test_sizemode_events.xhtml"] ["test_standalone_native_menu.xhtml"] -skip-if = ["toolkit != 'cocoa'"] # Cocoa widget test +run-if = ["os == 'mac'"] # Cocoa widget test support-files = ["standalone_native_menu_window.xhtml"] ["test_surrogate_pair_native_key_handling.xhtml"] -skip-if = ["toolkit != 'windows'"] # Windows widget test +run-if = ["os == 'win'"] # Windows widget test ["test_system_font_changes.xhtml"] support-files = ["system_font_changes.xhtml"] -run-if = ["toolkit == 'gtk'"] # Currently the test works on only gtk3 +run-if = ["os == 'linux'"] # Currently the test works on only gtk3 ["test_system_status_bar.xhtml"] -skip-if = ["toolkit != 'cocoa'"] # Cocoa widget test +run-if = ["os == 'mac'"] # Cocoa widget test ["test_taskbar_progress.xhtml"] skip-if = [ - "toolkit != 'cocoa' && toolkit != 'windows'", - "(os == 'win' && os_version == '10.0' && !ccov)", # Bug 1456811 + "os == 'linux'", + "os == 'android'", + "win10_2009 && !ccov", # Bug 1456811 ] ["test_transferable_overflow.xhtml"] -skip-if = ["(verify && (os == 'mac' || os == 'linux'))"] +skip-if = [ + "verify && apple_catalina", + "verify && os == 'linux'", +] ["test_wheeltransaction.xhtml"] support-files = ["window_wheeltransaction.xhtml"]