UPSTREAM MERGE BROKEN: Merge upstream commit '519b0bc5dc' into master

This commit is contained in:
Steven Roose 2019-05-17 14:55:01 +01:00
commit f4889a5253
No known key found for this signature in database
GPG key ID: 2F2A88D7F8D68E87
537 changed files with 31484 additions and 10750 deletions

View file

@ -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);