diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:37 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:37 +0000 |
| commit | a90a5cba08fdf6c0ceb95101c275108a152a3aed (patch) | |
| tree | 532507288f3defd7f4dcf1af49698bcb76034855 /tools/profiler/tests/gtest | |
| parent | Adding debian version 126.0.1-1. (diff) | |
| download | firefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.tar.xz firefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.zip | |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tools/profiler/tests/gtest')
| -rw-r--r-- | tools/profiler/tests/gtest/moz.build | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/profiler/tests/gtest/moz.build b/tools/profiler/tests/gtest/moz.build index e1c3994621..ea5ca1f228 100644 --- a/tools/profiler/tests/gtest/moz.build +++ b/tools/profiler/tests/gtest/moz.build @@ -30,7 +30,8 @@ LOCAL_INCLUDES += [ "/tools/profiler/lul", ] -if CONFIG["OS_TARGET"] != "Android": +# Bug 1885381 - Hangs/timeouts under TSAN +if CONFIG["OS_TARGET"] != "Android" and not CONFIG["MOZ_TSAN"]: UNIFIED_SOURCES += [ "GeckoProfiler.cpp", "ThreadProfileTest.cpp", |