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 /toolkit/profile | |
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 'toolkit/profile')
-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", ] |