From 8dd16259287f58f9273002717ec4d27e97127719 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:43:14 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- toolkit/profile/gtest/moz.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'toolkit/profile') 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", ] -- cgit v1.2.3