diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-16 09:59:52 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-16 10:00:05 +0200 |
| commit | 6f0458d1ec7eb106d563c5c03bdc8fdbfac06c57 (patch) | |
| tree | 5073ba21115c39731ffbbbc37930c36e7788c4d3 | |
| parent | 984ff68c679e9a40e14e791c6363c6136639a686 (diff) | |
| parent | 9322f1a4d9ab301f2f6b8a404fb6012d8b50ef74 (diff) | |
| download | bitcoin-6f0458d1ec7eb106d563c5c03bdc8fdbfac06c57.tar.xz | |
Merge pull request #4710
9322f1a tests: fix test-runner for osx. Closes ##4708 (Cory Fields)
| -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 e186bd7a23..67318e5a4c 100755 --- a/qa/pull-tester/run-bitcoind-for-test.sh.in +++ b/qa/pull-tester/run-bitcoind-for-test.sh.in @@ -9,7 +9,7 @@ mkdir -p "$DATADIR"/regtest touch "$DATADIR/regtest/debug.log" tail -q -n 1 -F "$DATADIR/regtest/debug.log" | grep -m 1 -q "Done loading" & WAITER=$! -PORT=`expr 10000 + $BASHPID % 55536` +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 -port=$PORT -whitelist=127.0.0.1 -regtest -rpcport=`expr $PORT + 1` & BITCOIND=$! |