diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-01-07 13:01:30 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-01-07 13:01:56 +0100 |
| commit | d79adc1ab18f897ab02da93e48c74ee2f44dce7a (patch) | |
| tree | 11fe5030abbe0ce8bb50756bafb70691c1390ce6 /qa | |
| parent | 729ba317498bf644c62975dbde07da5ab9ef0043 (diff) | |
| parent | 1c52aad540ec1370db60fd68fc3485413e3cb8e1 (diff) | |
| download | bitcoin-d79adc1ab18f897ab02da93e48c74ee2f44dce7a.tar.xz | |
Merge pull request #5535
1c52aad Require sufficent priority for relay of free transactions (Pieter Wuille)
Diffstat (limited to 'qa')
| -rwxr-xr-x | qa/pull-tester/run-bitcoind-for-test.sh.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qa/pull-tester/run-bitcoind-for-test.sh.in b/qa/pull-tester/run-bitcoind-for-test.sh.in index 42d8ad52e8..14ae08e4e5 100755 --- a/qa/pull-tester/run-bitcoind-for-test.sh.in +++ b/qa/pull-tester/run-bitcoind-for-test.sh.in @@ -10,7 +10,7 @@ touch "$DATADIR/regtest/debug.log" tail -q -n 1 -F "$DATADIR/regtest/debug.log" | grep -m 1 -q "Done loading" & WAITER=$! PORT=`expr 10000 + $$ % 55536` -"@abs_top_builddir@/src/bitcoind@EXEEXT@" -connect=0.0.0.0 -datadir="$DATADIR" -rpcuser=user -rpcpassword=pass -listen -keypool=3 -debug -debug=net -logtimestamps -checkmempool=0 -port=$PORT -whitelist=127.0.0.1 -regtest -rpcport=`expr $PORT + 1` & +"@abs_top_builddir@/src/bitcoind@EXEEXT@" -connect=0.0.0.0 -datadir="$DATADIR" -rpcuser=user -rpcpassword=pass -listen -keypool=3 -debug -debug=net -logtimestamps -checkmempool=0 -relaypriority=0 -port=$PORT -whitelist=127.0.0.1 -regtest -rpcport=`expr $PORT + 1` & BITCOIND=$! #Install a watchdog. |