diff --git a/dom/media/test/browser/browser.toml b/dom/media/test/browser/browser.toml index 151ef6d3a5ce..25413e96ecf2 100644 --- a/dom/media/test/browser/browser.toml +++ b/dom/media/test/browser/browser.toml @@ -26,7 +26,7 @@ tags = "bleedover" ["browser_glean_first_frame_loaded_time.js"] tags = "os_integration" -skip-if = ["os == 'mac' && os_version == '14.40'"] # Bug 1909908 +skip-if = ["os == 'mac' && os_version == '14.70' && processor == 'x86_64'"] # Bug 1909908 ["browser_tab_visibility_and_play_time.js"] diff --git a/dom/media/test/mochitest.toml b/dom/media/test/mochitest.toml index 44887c0e143b..e331625000ed 100644 --- a/dom/media/test/mochitest.toml +++ b/dom/media/test/mochitest.toml @@ -764,7 +764,7 @@ tags = "cloneelementvisually" ["test_cloneElementVisually_resource_change.html"] skip-if = [ "os == 'linux' && !(debug || asan || tsan)", # Bug 1559308 - lower frequency intermittent - "os == 'mac' && os_version == '14.40'", # Bug 1909908 + "os == 'mac' && os_version == '14.70' && processor == 'x86_64'", # Bug 1909908 ] tags = "cloneelementvisually os_integration" diff --git a/dom/media/test/mochitest_media_recorder.toml b/dom/media/test/mochitest_media_recorder.toml index f1d4938e1ea6..6e6069ec7874 100644 --- a/dom/media/test/mochitest_media_recorder.toml +++ b/dom/media/test/mochitest_media_recorder.toml @@ -729,7 +729,7 @@ skip-if = ["os == 'android'"] # android(bug 1232305) skip-if = [ "os == 'win' && os_version == '10.2009'", # Bug 1453375 "os == 'android'", # Bug 1694645 - "os == 'mac' && os_version == '14.40'", # Bug 1909908 + "os == 'mac' && os_version == '14.70' && processor == 'x86_64'", # Bug 1909908 ] ["test_mediarecorder_record_4ch_audiocontext.html"] diff --git a/netwerk/test/unit/xpcshell.toml b/netwerk/test/unit/xpcshell.toml index 2ae3fa9f9b13..19519a78c789 100644 --- a/netwerk/test/unit/xpcshell.toml +++ b/netwerk/test/unit/xpcshell.toml @@ -983,17 +983,17 @@ skip-if = [ ["test_proxy-slow-upload.js"] -["test_proxy_cancel.js"] -run-sequentially = "node server exceptions dont replay well" - -["test_proxy_pac.js"] - ["test_proxyDNS_leak.js"] skip-if = [ "os == 'android'", "socketprocess_networking", ] +["test_proxy_cancel.js"] +run-sequentially = "node server exceptions dont replay well" + +["test_proxy_pac.js"] + ["test_proxyconnect.js"] skip-if = [ "tsan", diff --git a/taskcluster/gecko_taskgraph/util/chunking.py b/taskcluster/gecko_taskgraph/util/chunking.py index f623d43366f7..4600a77e8788 100644 --- a/taskcluster/gecko_taskgraph/util/chunking.py +++ b/taskcluster/gecko_taskgraph/util/chunking.py @@ -123,6 +123,7 @@ def guess_mozinfo_from_task(task, repo="", app_version="", test_tags=[]): ("macosx", "1015"): "10.15", ("macosx", "1100"): "11.20", ("macosx", "1400"): "14.40", + ("macosx", "1470"): "14.70", ("windows", "10"): "10.2009", ("windows", "11"): "11.2009", } diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py index c7c6a59a2594..0eed5bccbcb4 100644 --- a/testing/mochitest/runtests.py +++ b/testing/mochitest/runtests.py @@ -1782,7 +1782,7 @@ toolbar#nav-bar { noDefaultFilters = True # TODO: remove this when crashreporter is fixed on mac via bug 1910777 - if info["os"] == "mac" and info["os_version"] == "14.40": + if info["os"] == "mac" and info["os_version"].split(".")[0] == "14": info["crashreporter"] = False tests = manifest.active_tests( diff --git a/testing/xpcshell/runxpcshelltests.py b/testing/xpcshell/runxpcshelltests.py index 5224d3cf5a7f..77b26a39aa12 100755 --- a/testing/xpcshell/runxpcshelltests.py +++ b/testing/xpcshell/runxpcshelltests.py @@ -1587,7 +1587,7 @@ class XPCShellTests(object): (release, versioninfo, machine) = platform.mac_ver() versionNums = release.split(".")[:2] os_version = "%s.%s" % (versionNums[0], versionNums[1].ljust(2, "0")) - if os_version == "14.40" and self.mozInfo["arch"] == "aarch64": + if os_version.split(".")[0] == "14": self.mozInfo["crashreporter"] = False # we default to false for e10s on xpcshell diff --git a/toolkit/crashreporter/test/unit/xpcshell.toml b/toolkit/crashreporter/test/unit/xpcshell.toml index f46200ac07fb..c471d74c6967 100644 --- a/toolkit/crashreporter/test/unit/xpcshell.toml +++ b/toolkit/crashreporter/test/unit/xpcshell.toml @@ -112,6 +112,7 @@ reason = "Windows test specific to the x86-64 architecture" skip-if = [ "os == 'android'", "os == 'mac' && os_version == '10.15' && processor == 'x86_64'", + "os == 'mac' && os_version == '14.70' && processor == 'x86_64'", "os == 'mac' && os_version == '11.20' && arch == 'aarch64'", "os == 'linux' && os_version == '18.04' && bits == 32", ]