mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-15 12:51:00 +02:00
UPSTREAM MERGE BROKEN: Merge upstream commit '519b0bc5dc' into master
This commit is contained in:
commit
f4889a5253
537 changed files with 31484 additions and 10750 deletions
|
|
@ -362,7 +362,8 @@ BOOST_AUTO_TEST_CASE(test_CheckQueue_FrozenCleanup)
|
|||
vChecks.push_back(new FrozenCleanupCheck());
|
||||
vChecks[0]->should_freeze = true;
|
||||
control.Add(vChecks);
|
||||
control.Wait(); // Hangs here
|
||||
bool waitResult = control.Wait(); // Hangs here
|
||||
assert(waitResult);
|
||||
});
|
||||
{
|
||||
std::unique_lock<std::mutex> l(FrozenCleanupCheck::m);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue