diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2014-02-18 12:11:46 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2014-02-18 12:11:46 -0500 |
| commit | ca4cf5cff6fb60c9769b62acce2e3a8fcd0e7aae (patch) | |
| tree | 87a92041e1d394ad06d8506be036973f5b5e0fd4 /qa | |
| parent | 5c9932345976de17b1a02401162466995d8355e3 (diff) | |
Wallet locking fixes for -DDEBUG_LOCKORDER
Compiling with -DDEBUG_LOCKORDER and running the qa/rpc-test/ regression
tests uncovered a couple of wallet methods that should (but didn't)
acquire the cs_wallet mutext.
I also changed the AssertLockHeld() routine print to stderr and
abort, instead of printing to debug.log and then assert()'ing.
It is annoying to look in debug.log to find out which
AssertLockHeld is failing.
Diffstat (limited to 'qa')
| -rwxr-xr-x | qa/rpc-tests/txnmall.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qa/rpc-tests/txnmall.sh b/qa/rpc-tests/txnmall.sh index 6bf92fce40..06e4f7102d 100755 --- a/qa/rpc-tests/txnmall.sh +++ b/qa/rpc-tests/txnmall.sh @@ -8,6 +8,8 @@ if [ $# -lt 1 ]; then exit 1 fi +set -f + BITCOIND=${1}/bitcoind CLI=${1}/bitcoin-cli @@ -23,13 +25,13 @@ D=$(mktemp -d test.XXXXX) D1=${D}/node1 CreateDataDir $D1 port=11000 rpcport=11001 -B1ARGS="-datadir=$D1 -debug" +B1ARGS="-datadir=$D1" $BITCOIND $B1ARGS & B1PID=$! D2=${D}/node2 CreateDataDir $D2 port=11010 rpcport=11011 -B2ARGS="-datadir=$D2 -debug" +B2ARGS="-datadir=$D2" $BITCOIND $B2ARGS & B2PID=$! |