From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:33 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- docshell/test/navigation/mochitest.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'docshell/test/navigation/mochitest.toml') diff --git a/docshell/test/navigation/mochitest.toml b/docshell/test/navigation/mochitest.toml index ce0fa0d18f..811ad7c89d 100644 --- a/docshell/test/navigation/mochitest.toml +++ b/docshell/test/navigation/mochitest.toml @@ -132,7 +132,10 @@ skip-if = ["os == 'android'"] ["test_bug430723.html"] skip-if = [ - "!debug && (os == 'mac' || os == 'win')", # Bug 874423 + "win10_2009 && !debug", # Bug 874423 + "win11_2009 && !debug", # Bug 874423 + "apple_silicon && !debug", # Bug 874423 + "apple_catalina && !debug", # Bug 874423 "http3", "http2", ] @@ -284,7 +287,7 @@ support-files = ["file_same_url.html"] ["test_session_history_on_redirect.html"] ["test_sessionhistory.html"] -skip-if = ["verify && os == 'mac' && debug"] # Hit MOZ_CRASH(Shutdown too long, probably frozen, causing a crash.) bug 1677545 +skip-if = ["os == 'mac' && debug && verify"] # Hit MOZ_CRASH(Shutdown too long, probably frozen, causing a crash.) bug 1677545 ["test_sessionhistory_document_write.html"] -- cgit v1.2.3