commit b032659478ce02e508ab5acb4440a2e69042de5d parent 3b1ae3f3771c02213359b38989803babecff31b0 Author: Joel Maher <joel.maher@gmail.com> Date: Mon, 24 Nov 2025 14:50:10 +0000 Bug 2001881 - fix macosx 15.30 arch to be aarch64, not x86_64 and green up high frequency mac failures. r=intermittent-reviewers,aryx Differential Revision: https://phabricator.services.mozilla.com/D273743 Diffstat:
14 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/accessible/tests/browser/events/browser.toml b/accessible/tests/browser/events/browser.toml @@ -16,6 +16,9 @@ prefs = [ ["browser_content_prompt.js"] ["browser_focus_document.js"] +skip-if = [ + "os == 'mac' && os_version == '15.30' && arch == 'aarch64'", # Bug 1962169 +] ["browser_initial_blank_load.js"] diff --git a/accessible/tests/browser/relations/browser.toml b/accessible/tests/browser/relations/browser.toml @@ -23,5 +23,9 @@ prefs = [ ["browser_relations_general.js"] ["browser_relations_general_002.js"] +skip-if = [ + "os == 'mac' && os_version == '15.30' && arch == 'aarch64'", # Bug 2001032 +] + ["browser_shadow_dom_and_custom_elements.js"] diff --git a/browser/base/content/test/about/browser.toml b/browser/base/content/test/about/browser.toml @@ -8,6 +8,7 @@ support-files = [ ["browser_aboutCertError.js"] skip-if = [ "os == 'mac' && os_version == '10.15' && arch == 'x86_64' && opt", + "os == 'mac' && os_version == '15.30' && arch == 'aarch64'", # Bug 1996741 ] ["browser_aboutCertError_cca_telemetry.js"] diff --git a/browser/base/content/test/gesture/browser.toml b/browser/base/content/test/gesture/browser.toml @@ -3,3 +3,6 @@ ["browser_gesture_navigation.js"] ["browser_gesture_scroll.js"] +skip-if = [ + "os == 'mac' && os_version == '15.30' && arch == 'aarch64'", # Bug 1988390 +] diff --git a/browser/base/content/test/siteIdentity/browser.toml b/browser/base/content/test/siteIdentity/browser.toml @@ -121,6 +121,9 @@ support-files = [ ["browser_mixed_content_cert_override.js"] tags = "mcb" +skip-if = [ + "os == 'mac' && os_version == '15.30' && arch == 'aarch64'", # Bug 1997430 +] support-files = ["test-mixedcontent-securityerrors.html"] diff --git a/browser/components/genai/tests/browser/browser.toml b/browser/components/genai/tests/browser/browser.toml @@ -33,6 +33,9 @@ support-files = [ ["browser_chat_shortcuts.js"] ["browser_chat_sidebar.js"] +skip-if = [ + "os == 'mac' && os_version == '15.30' && arch == 'aarch64'", # Bug 1992633 +] ["browser_chat_telemetry.js"] skip-if = [ @@ -56,6 +59,9 @@ support-files = [ "data/readableEn.html", "data/encodingWithShiftJIS.html" ] +skip-if = [ + "os == 'mac' && os_version == '15.30' && arch == 'aarch64'", # Bug 1996489 +] ["browser_link_preview_nimbus.js"] diff --git a/browser/components/places/tests/browser/browser.toml b/browser/components/places/tests/browser/browser.toml @@ -53,6 +53,9 @@ skip-if = [ ["browser_bookmark_add_tags.js"] https_first_disabled = true +skip-if = [ + "os == 'mac' && os_version == '15.30' && arch == 'aarch64'", # Bug 1775656 +] ["browser_bookmark_backup_export_import.js"] @@ -116,6 +119,9 @@ skip-if = [ ["browser_bug427633_no_newfolder_if_noip.js"] ["browser_bug485100-change-case-loses-tag.js"] +skip-if = [ + "socketprocess_networking", # Bug 1973561 +] ["browser_bug631374_tags_selector_scroll.js"] support-files = ["favicon-normal16.png"] diff --git a/browser/components/sidebar/tests/browser/browser.toml b/browser/components/sidebar/tests/browser/browser.toml @@ -16,6 +16,9 @@ skip-if = [ ["browser_domfullscreen_sidebar.js"] ["browser_extensions_sidebar.js"] +skip-if = [ + "os == 'mac' && os_version == '15.30' && arch == 'aarch64'", # Bug 1894409 +] ["browser_glean_sidebar.js"] skip-if = [ diff --git a/browser/components/tabbrowser/test/browser/tabs/browser.toml b/browser/components/tabbrowser/test/browser/tabs/browser.toml @@ -34,6 +34,9 @@ tags = "vertical-tabs" fail-if = [ "vertical_tab", # Bug 1935548, fails in the "vertical-tabs" variant ] +skip-if = [ + "os == 'mac' && os_version == '15.30' && arch == 'aarch64'", # Bug 1988657 +] ["browser_beforeunload_duplicate_dialogs.js"] https_first_disabled = true @@ -629,7 +632,9 @@ tags = "vertical-tabs" ["browser_tab_splitview_contextmenu.js"] skip-if = [ + "os == 'linux' && os_version == '24.04' && arch == 'x86_64' && display == 'x11' && opt", # Bug 1996471 "os == 'mac' && os_version == '10.15' && arch == 'x86_64'", # Bug 1994508 + "os == 'mac' && os_version == '15.30' && arch == 'aarch64'", # Bug 1996471 ] ["browser_tab_splitview_footer.js"] diff --git a/docshell/test/browser/browser.toml b/docshell/test/browser/browser.toml @@ -98,6 +98,7 @@ skip-if = [ ["browser_bfcache_copycommand.js"] skip-if = [ "os == 'linux' && os_version == '24.04' && arch == 'x86_64' && display == 'x11' && opt", # Bug 1730593 + "os == 'mac' && os_version == '15.30' && arch == 'aarch64'", # Bug 1775931 ] ["browser_browsingContext-01.js"] diff --git a/gfx/layers/apz/test/mochitest/browser.toml b/gfx/layers/apz/test/mochitest/browser.toml @@ -76,6 +76,7 @@ run-if = [ support-files = ["helper_position_sticky_flicker.html"] skip-if = [ "os == 'linux' && os_version == '24.04' && arch == 'x86_64' && display == 'x11' && a11y_checks", # bug 1924676 + "os == 'mac' && os_version == '15.30' && arch == 'aarch64'", # Bug 1924676 ] ["browser_test_reset_scaling_zoom.js"] @@ -103,6 +104,7 @@ support-files = [ ["browser_test_select_zoom.js"] support-files = ["helper_test_select_zoom.html"] skip-if = [ + "os == 'mac' && os_version == '10.15' && arch == 'x86_64' && opt", # bug 1938737 "os == 'win' && os_version == '11.26100' && arch == 'x86'", # bug 1495580 "os == 'win' && os_version == '11.26100' && arch == 'x86_64'", # bug 1495580 ] diff --git a/testing/mozbase/mozinfo/mozinfo/mozinfo.py b/testing/mozbase/mozinfo/mozinfo/mozinfo.py @@ -157,8 +157,8 @@ info.update( } ) -# we want to transition to this instead of using `!debug`, etc. -info["arch"] = info["processor"] +if info.get("arch", "") != "aarch64": + info["arch"] = info["processor"] if info["os"] == "linux": @@ -193,7 +193,9 @@ def sanitize(info): else: info["processor"] = "x86" info["bits"] = 32 - info["arch"] = info["processor"] + + if info.get("arch", "") != "aarch64": + info["arch"] = info["processor"] # method for updating information diff --git a/toolkit/components/viewsource/test/browser/browser.toml b/toolkit/components/viewsource/test/browser/browser.toml @@ -10,6 +10,7 @@ https_first_disabled = true ["browser_bug713810.js"] skip-if = [ "os == 'win' && os_version == '11.26100' && arch == 'x86_64' && opt", # Bug 1775668 + "os == 'mac' && os_version == '15.30' && arch == 'aarch64'", # Bug 1775668 ] ["browser_contextmenu.js"] diff --git a/toolkit/crashreporter/test/unit/xpcshell.toml b/toolkit/crashreporter/test/unit/xpcshell.toml @@ -11,6 +11,9 @@ support-files = [ tags = "os_integration" ["test_crash_AsyncShutdown.js"] +skip-if = [ + "os == 'mac' && os_version == '15.30' && arch == 'aarch64'", # Bug 1993829 +] ["test_crash_abort.js"] skip-if = [