diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-11-03 09:22:38 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-11-03 09:23:17 +0100 |
| commit | 2a6972133f07382d13e08edc9c2e6c231689b2db (patch) | |
| tree | 70dd887ead3967e1da0da825f3cb2af179ed1222 /qa/rpc-tests/txnmall.sh | |
| parent | 7a9356bf16d3e21b99ce6badc88f949679f8e846 (diff) | |
| parent | 2191eac812a72fe57167be882bddd2e6a3f0340e (diff) | |
Merge pull request #5185
2191eac add tests to travis (Cory Fields)
7667850 tests: replace the old (unused since Travis) tests with new rpc test scripts (Cory Fields)
fa7f8cd tests: remove old pull-tester scripts (Cory Fields)
5122ea7 tests: fix forknotify.py on windows (Cory Fields)
7a41614 tests: allow rpc-tests to get filenames for bitcoind and bitcoin-cli from the environment (Cory Fields)
f635269 tests: enable alertnotify test for Windows (Cory Fields)
Diffstat (limited to 'qa/rpc-tests/txnmall.sh')
| -rwxr-xr-x | qa/rpc-tests/txnmall.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qa/rpc-tests/txnmall.sh b/qa/rpc-tests/txnmall.sh index 035e7ee15f..1296d54d92 100755 --- a/qa/rpc-tests/txnmall.sh +++ b/qa/rpc-tests/txnmall.sh @@ -8,13 +8,14 @@ if [ $# -lt 1 ]; then echo "Usage: $0 path_to_binaries" echo "e.g. $0 ../../src" + echo "Env vars BITCOIND and BITCOINCLI may be used to specify the exact binaries used" exit 1 fi set -f -BITCOIND=${1}/bitcoind -CLI=${1}/bitcoin-cli +BITCOIND=${BITCOIND:-${1}/bitcoind} +CLI=${BITCOINCLI:-${1}/bitcoin-cli} DIR="${BASH_SOURCE%/*}" SENDANDWAIT="${DIR}/send.sh" |