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 /dom/media/doctor | |
| 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 'dom/media/doctor')
| -rw-r--r-- | dom/media/doctor/DDLifetime.cpp | 1 | ||||
| -rw-r--r-- | dom/media/doctor/test/gtest/moz.build | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/dom/media/doctor/DDLifetime.cpp b/dom/media/doctor/DDLifetime.cpp index 2d4c6cb966..c1d2a01a1c 100644 --- a/dom/media/doctor/DDLifetime.cpp +++ b/dom/media/doctor/DDLifetime.cpp @@ -5,6 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "DDLifetime.h" +#include "mozilla/IntegerPrintfMacros.h" namespace mozilla { diff --git a/dom/media/doctor/test/gtest/moz.build b/dom/media/doctor/test/gtest/moz.build index 7ae9eae130..3ee3f23f4d 100644 --- a/dom/media/doctor/test/gtest/moz.build +++ b/dom/media/doctor/test/gtest/moz.build @@ -6,10 +6,15 @@ if CONFIG["OS_TARGET"] != "Android": UNIFIED_SOURCES += [ - "TestMultiWriterQueue.cpp", "TestRollingNumber.cpp", ] + # Bug 1894309 - Fails under TSAN + if not CONFIG["MOZ_TSAN"]: + UNIFIED_SOURCES += [ + "TestMultiWriterQueue.cpp", + ] + include("/ipc/chromium/chromium-config.mozbuild") LOCAL_INCLUDES += [ |