summaryrefslogtreecommitdiffstats
path: root/xpcom/tests/gtest/moz.build
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-12 05:43:14 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-12 05:43:14 +0000
commit8dd16259287f58f9273002717ec4d27e97127719 (patch)
tree3863e62a53829a84037444beab3abd4ed9dfc7d0 /xpcom/tests/gtest/moz.build
parentReleasing progress-linux version 126.0.1-1~progress7.99u1. (diff)
downloadfirefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz
firefox-8dd16259287f58f9273002717ec4d27e97127719.zip
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'xpcom/tests/gtest/moz.build')
-rw-r--r--xpcom/tests/gtest/moz.build16
1 files changed, 8 insertions, 8 deletions
diff --git a/xpcom/tests/gtest/moz.build b/xpcom/tests/gtest/moz.build
index 4d8d38e89a..22a5b1751d 100644
--- a/xpcom/tests/gtest/moz.build
+++ b/xpcom/tests/gtest/moz.build
@@ -66,8 +66,8 @@ UNIFIED_SOURCES += [
"TestTaskQueue.cpp",
"TestTextFormatter.cpp",
"TestThreadManager.cpp",
- "TestThreadPool.cpp",
"TestThreadPoolListener.cpp",
+ "TestThreadUtils.cpp",
"TestThrottledEventQueue.cpp",
"TestTimeStamp.cpp",
"TestTokenizer.cpp",
@@ -75,24 +75,24 @@ UNIFIED_SOURCES += [
"TestVariant.cpp",
]
+# Bug 1894540 - Fails under TSAN
+if not CONFIG["MOZ_TSAN"]:
+ UNIFIED_SOURCES += [
+ "TestThreadPool.cpp",
+ ]
+
if CONFIG["OS_TARGET"] != "Android":
UNIFIED_SOURCES += [
"TestPipes.cpp",
"TestThreads.cpp",
]
-# skip the test on windows10-aarch64 due to perma-fail, bug 1422219
-if not (CONFIG["OS_TARGET"] == "WINNT" and CONFIG["TARGET_CPU"] == "aarch64"):
- UNIFIED_SOURCES += ["TestThreadUtils.cpp"]
-
# skip the test on OSX due to frequent failures (bug 1571186)
if CONFIG["OS_TARGET"] != "Darwin":
UNIFIED_SOURCES += ["TestExpirationTracker.cpp"]
# skip the test on windows10-aarch64 and Android, aarch64 due to bug 1545670
-if CONFIG["OS_TARGET"] != "Android" and not (
- CONFIG["OS_TARGET"] == "WINNT" and CONFIG["TARGET_CPU"] == "aarch64"
-):
+if CONFIG["OS_TARGET"] != "Android":
UNIFIED_SOURCES += ["TestTimers.cpp"]