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 /tools/profiler/tests/xpcshell | |
| 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 'tools/profiler/tests/xpcshell')
| -rw-r--r-- | tools/profiler/tests/xpcshell/test_feature_cpufreq.js | 2 | ||||
| -rw-r--r-- | tools/profiler/tests/xpcshell/xpcshell.toml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/profiler/tests/xpcshell/test_feature_cpufreq.js b/tools/profiler/tests/xpcshell/test_feature_cpufreq.js index 1d8e0d9a36..4bab2d1019 100644 --- a/tools/profiler/tests/xpcshell/test_feature_cpufreq.js +++ b/tools/profiler/tests/xpcshell/test_feature_cpufreq.js @@ -87,7 +87,7 @@ function getInflatedCPUFreqMarkers(thread) { * schema: MarkerSchema; * }} */ -async function runProfilerWithCPUSpeed(features, filename) { +async function runProfilerWithCPUSpeed(features) { const entries = 10000; const interval = 10; const threads = []; diff --git a/tools/profiler/tests/xpcshell/xpcshell.toml b/tools/profiler/tests/xpcshell/xpcshell.toml index a04dcd6789..5c094899a4 100644 --- a/tools/profiler/tests/xpcshell/xpcshell.toml +++ b/tools/profiler/tests/xpcshell/xpcshell.toml @@ -39,6 +39,7 @@ skip-if = ["tsan"] # Times out on TSan, bug 1612707 skip-if = [ "release_or_beta", "os == 'win' && socketprocess_networking", + "tsan", # bug 1885381 ] ["test_feature_nativeallocations.js"] |