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 /ipc/chromium/gtest | |
| 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 'ipc/chromium/gtest')
| -rw-r--r-- | ipc/chromium/gtest/moz.build | 7 | ||||
| -rw-r--r-- | ipc/chromium/gtest/ports_unittest.cc | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/ipc/chromium/gtest/moz.build b/ipc/chromium/gtest/moz.build index afa175c638..a1af974b16 100644 --- a/ipc/chromium/gtest/moz.build +++ b/ipc/chromium/gtest/moz.build @@ -8,9 +8,14 @@ Library("ipcchromiumtest") SOURCES += [ "name_unittest.cc", - "ports_unittest.cc", ] +# Bug 1837550 - Fails under TSAN +if not CONFIG["MOZ_TSAN"]: + SOURCES += [ + "ports_unittest.cc", + ] + include("/ipc/chromium/chromium-config.mozbuild") FINAL_LIBRARY = "xul-gtest" diff --git a/ipc/chromium/gtest/ports_unittest.cc b/ipc/chromium/gtest/ports_unittest.cc index bfa8214799..705bab7edb 100644 --- a/ipc/chromium/gtest/ports_unittest.cc +++ b/ipc/chromium/gtest/ports_unittest.cc @@ -237,6 +237,10 @@ class TestNode : public NodeDelegate { } } + void ObserveRemoteNode(const NodeName& node) override { + DCHECK(node != node_name_); + } + void ClosePortsInEvent(Event* event) { if (event->type() != Event::Type::kUserMessage) { return; |