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 /toolkit/profile/gtest/moz.build | |
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 'toolkit/profile/gtest/moz.build')
-rw-r--r-- | toolkit/profile/gtest/moz.build | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/toolkit/profile/gtest/moz.build b/toolkit/profile/gtest/moz.build index d9219b4113..829975dbdd 100644 --- a/toolkit/profile/gtest/moz.build +++ b/toolkit/profile/gtest/moz.build @@ -12,7 +12,11 @@ UNIFIED_SOURCES += [ "TestProfileLock.cpp", ] -if CONFIG["OS_ARCH"] == "Linux" and CONFIG["OS_TARGET"] != "Android": +if ( + CONFIG["OS_ARCH"] == "Linux" + and CONFIG["OS_TARGET"] != "Android" + and not CONFIG["MOZ_TSAN"] # Bug 1894417 +): UNIFIED_SOURCES += [ "TestProfileLockRetry.cpp", ] |