diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-01-31 13:27:32 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-02-02 12:30:46 +0000 |
commit | d67d4bb6b90f1659b1bd3cb2129c53fce3a47145 (patch) | |
tree | 1f3703c780a0608ff4333a5151c097c61dac1d9e | |
parent | 1fd9f11a2dc1ef7cf52c2a631ca0e9b9921bc759 (diff) |
Remove pending messages DCHECK to stop certain tests from crashing
Certain tests like tst_QWebEngineView::reusePage can cause render
and ppapi processes to be killed very soon after creation,
sometimes leaving behind pending IPC messages. This will cause a
DCHECK assert on macOS, killing the whole test.
Remove the DCHECK so it doesn't crash the tests. This has no dangerous
consequence, given that appropriate error messages will be logged
instead.
Change-Id: Ia6db3367d34bd330803734f990220b5216efc19d
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r-- | chromium/mojo/edk/system/node_channel.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chromium/mojo/edk/system/node_channel.cc b/chromium/mojo/edk/system/node_channel.cc index eb83f2e22e1..38f23cc0a01 100644 --- a/chromium/mojo/edk/system/node_channel.cc +++ b/chromium/mojo/edk/system/node_channel.cc @@ -771,7 +771,10 @@ void NodeChannel::ProcessPendingMessagesWithMachPorts() { pending_writes.swap(pending_write_messages_); pending_relays.swap(pending_relay_messages_); } +#if !defined(TOOLKIT_QT) + // Can crash a test in debug mode if render or ppapi process is killed too fast after creation. DCHECK(pending_writes.empty() && pending_relays.empty()); +#endif while (!pending_writes.empty()) { Channel::MessagePtr message = std::move(pending_writes.front()); |