summaryrefslogtreecommitdiffstats
path: root/browser/components/uitour
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 01:14:29 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 01:14:29 +0000
commitfbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch)
tree4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /browser/components/uitour
parentReleasing progress-linux version 124.0.1-1~progress7.99u1. (diff)
downloadfirefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz
firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'browser/components/uitour')
-rw-r--r--browser/components/uitour/test/browser.toml20
1 files changed, 12 insertions, 8 deletions
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"]