diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /dom/media/doctor | |
parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.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 += [ |