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 --- browser/components/uitour/test/browser.toml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'browser/components/uitour') diff --git a/browser/components/uitour/test/browser.toml b/browser/components/uitour/test/browser.toml index 2fb9cfa025..d5027d910f 100644 --- a/browser/components/uitour/test/browser.toml +++ b/browser/components/uitour/test/browser.toml @@ -9,7 +9,7 @@ support-files = [ ["browser_UITour.js"] skip-if = [ - "os == 'linux'", # Intermittent failures, bug 951965 + "os == 'linux' && os_version == '18.04'", # Intermittent failures, bug 951965 "verify", ] @@ -35,7 +35,7 @@ fail-if = ["a11y_checks"] # Bug 1854526 clicked UITourTooltipClose may not be fo ["browser_UITour_forceReaderMode.js"] ["browser_UITour_modalDialog.js"] -skip-if = ["os != 'mac'"] # modal dialog disabling only working on OS X. +run-if = ["os == 'mac'"] # modal dialog disabling only working on OS X. ["browser_UITour_observe.js"] @@ -48,26 +48,30 @@ skip-if = ["true"] # Disabled pending removal of pocket UI Tour ["browser_UITour_private_browsing.js"] ["browser_UITour_resetProfile.js"] -skip-if = ["verify && !debug && (os == 'linux')"] +skip-if = ["os == 'linux' && os_version == '18.04' && !debug && verify"] ["browser_UITour_showNewTab.js"] -skip-if = ["verify && !debug && (os == 'linux')"] +skip-if = ["os == 'linux' && os_version == '18.04' && !debug && verify"] ["browser_UITour_showProtectionReport.js"] -skip-if = ["os == 'linux' && (asan || debug || tsan)"] # Bug 1697217 +skip-if = [ + "os == 'linux' && os_version == '18.04' && asan", # Bug 1697217 + "os == 'linux' && os_version == '18.04' && debug", # Bug 1697217 + "os == 'linux' && os_version == '18.04' && tsan", # Bug 1697217 +] ["browser_UITour_sync.js"] skip-if = [ - "os == 'linux'", # Bug 1678417 + "os == 'linux' && os_version == '18.04'", # Bug 1678417 ] ["browser_UITour_toggleReaderMode.js"] -skip-if = ["verify && !debug && (os == 'linux')"] +skip-if = ["os == 'linux' && os_version == '18.04' && !debug && verify"] ["browser_backgroundTab.js"] ["browser_closeTab.js"] -skip-if = ["verify && !debug && (os == 'linux')"] +skip-if = ["os == 'linux' && os_version == '18.04' && !debug && verify"] ["browser_fxa.js"] -- cgit v1.2.3