diff options
author | practicalswift <practicalswift@users.noreply.github.com> | 2018-12-15 09:59:24 +0100 |
---|---|---|
committer | practicalswift <practicalswift@users.noreply.github.com> | 2018-12-15 16:14:36 +0100 |
commit | d98a29ec408590e54f405a7f8d232cd9dc5b14da (patch) | |
tree | 296ebb3a7a3c3af2fd27c7527df4cc1a6b3e8edd /src/test | |
parent | 9133227298ad97bbb10c44ac038f614c0bd7f7c7 (diff) | |
download | bitcoin-d98a29ec408590e54f405a7f8d232cd9dc5b14da.tar.xz |
Fix cuckoocache_tests TSAN failure introduced in #14935. Fixes #14967.
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/checkqueue_tests.cpp | 3 | ||||
-rw-r--r-- | src/test/cuckoocache_tests.cpp | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/test/checkqueue_tests.cpp b/src/test/checkqueue_tests.cpp index 978accf3fe..3469c6dfba 100644 --- a/src/test/checkqueue_tests.cpp +++ b/src/test/checkqueue_tests.cpp @@ -355,7 +355,8 @@ BOOST_AUTO_TEST_CASE(test_CheckQueue_FrozenCleanup) // would get called twice). vChecks[0].should_freeze = true; control.Add(vChecks); - BOOST_CHECK(control.Wait()); // Hangs here + bool waitResult = control.Wait(); // Hangs here + assert(waitResult); }); { std::unique_lock<std::mutex> l(FrozenCleanupCheck::m); diff --git a/src/test/cuckoocache_tests.cpp b/src/test/cuckoocache_tests.cpp index a99e17693a..d8286520ec 100644 --- a/src/test/cuckoocache_tests.cpp +++ b/src/test/cuckoocache_tests.cpp @@ -220,8 +220,10 @@ static void test_cache_erase_parallel(size_t megabytes) size_t ntodo = (n_insert/4)/3; size_t start = ntodo*x; size_t end = ntodo*(x+1); - for (uint32_t i = start; i < end; ++i) - BOOST_CHECK(set.contains(hashes[i], true)); + for (uint32_t i = start; i < end; ++i) { + bool contains = set.contains(hashes[i], true); + assert(contains); + } }); /** Wait for all threads to finish |