diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-05-10 12:07:47 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-05-10 12:08:08 +0200 |
| commit | 5767e80dda7a699597b4798d1546e618edb50928 (patch) | |
| tree | 19669c274817b11fa0b036414a081f6c2871cf04 /src/test/scheduler_tests.cpp | |
| parent | Merge #8012: Qt: Delay user confirmation of send (diff) | |
| parent | Notify other serviceQueue thread we are finished to prevent deadlocks. (diff) | |
| download | discoin-5767e80dda7a699597b4798d1546e618edb50928.tar.xz discoin-5767e80dda7a699597b4798d1546e618edb50928.zip | |
Merge #8016: Fix multithread CScheduler and reenable test
166e4b0 Notify other serviceQueue thread we are finished to prevent deadlocks. (Pavel Janík)
db18ab2 Reenable multithread scheduler test. (Pavel Janík)
Diffstat (limited to 'src/test/scheduler_tests.cpp')
| -rw-r--r-- | src/test/scheduler_tests.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/test/scheduler_tests.cpp b/src/test/scheduler_tests.cpp index 9acd0e243..aa12dfbd5 100644 --- a/src/test/scheduler_tests.cpp +++ b/src/test/scheduler_tests.cpp @@ -40,7 +40,6 @@ static void MicroSleep(uint64_t n) #endif } -#if 0 /* Disabled for now because there is a race condition issue in this test - see #6540 */ BOOST_AUTO_TEST_CASE(manythreads) { seed_insecure_rand(false); @@ -116,6 +115,5 @@ BOOST_AUTO_TEST_CASE(manythreads) } BOOST_CHECK_EQUAL(counterSum, 200); } -#endif BOOST_AUTO_TEST_SUITE_END() |