diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2014-10-30 18:59:58 -0400 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2014-10-31 00:05:55 -0400 |
| commit | 7a41614aa27b9d3855b6145831cb4ad958f78823 (patch) | |
| tree | 0badd7331426f3c776b39ae6d2f2f4a1786d73a6 /qa/rpc-tests/conflictedbalance.sh | |
| parent | f635269cd154eb69ad67a6fb004ed360b6112e27 (diff) | |
| download | bitcoin-7a41614aa27b9d3855b6145831cb4ad958f78823.tar.xz | |
tests: allow rpc-tests to get filenames for bitcoind and bitcoin-cli from the environment
This will allow for windows tests to run with bitcoind.exe and bitcoin-cli.exe
Diffstat (limited to 'qa/rpc-tests/conflictedbalance.sh')
| -rwxr-xr-x | qa/rpc-tests/conflictedbalance.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qa/rpc-tests/conflictedbalance.sh b/qa/rpc-tests/conflictedbalance.sh index 71761321ed..a112244c74 100755 --- a/qa/rpc-tests/conflictedbalance.sh +++ b/qa/rpc-tests/conflictedbalance.sh @@ -18,13 +18,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" |