diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /testing/talos/talos/tests/devtools/addon/content/damp-tests.js | |
parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
download | firefox-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 'testing/talos/talos/tests/devtools/addon/content/damp-tests.js')
-rw-r--r-- | testing/talos/talos/tests/devtools/addon/content/damp-tests.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/testing/talos/talos/tests/devtools/addon/content/damp-tests.js b/testing/talos/talos/tests/devtools/addon/content/damp-tests.js index 4a7a6fe78d..d55af15efd 100644 --- a/testing/talos/talos/tests/devtools/addon/content/damp-tests.js +++ b/testing/talos/talos/tests/devtools/addon/content/damp-tests.js @@ -5,6 +5,7 @@ "use strict"; const isWindows = Services.appinfo.OS === "WINNT"; +const isMacOS = Services.appinfo.OS === "Darwin"; // DAMP is split in sub-suites to run the tests faster on continuous integration. // See the initial patches in Bug 1749928 if we need to add more suites. @@ -232,6 +233,8 @@ module.exports = { { name: "browser-toolbox", path: "toolbox/browser-toolbox.js", + // Bug 1881503 - disabled toolbox/browser-toolbox on windows and mac for causing permafails + disabled: isWindows || isMacOS, }, { name: "server.protocoljs", |