From fd67424c829b9bb0ed7f4a53040524c560262810 Mon Sep 17 00:00:00 2001 From: Gavin Andresen Date: Thu, 23 Jan 2014 14:18:26 -0500 Subject: Unit test fixes for AssertLockHeld / -DDEBUG_LOCKORDER Unit tests would fail if compiled with -DDEBUG_LOCKORDER (AssertLockHeld() would fail; AssertLockHeld() relies on the DEBUG_LOCKORDER code to keep track of locks held). Fixed by LOCK'ing the wallet mutex in the unit tests that manipulate the wallet. --- src/test/wallet_tests.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/test/wallet_tests.cpp') diff --git a/src/test/wallet_tests.cpp b/src/test/wallet_tests.cpp index 0acd94ef36..bd0517ae08 100644 --- a/src/test/wallet_tests.cpp +++ b/src/test/wallet_tests.cpp @@ -62,6 +62,8 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests) CoinSet setCoinsRet, setCoinsRet2; int64_t nValueRet; + LOCK(wallet.cs_wallet); + // test multiple times to allow for differences in the shuffle order for (int i = 0; i < RUN_TESTS; i++) { -- cgit v1.2.3