Permalink
Browse files

test: don't override BITCOIND and BITCOINCLI if they're set

In rpc-tests.py, don't override BITCOIND and BITCOINCLI if they're
already set. Makes it possible to run the tests with either another tree
or the GUI.

Github-Pull: #7209
Rebased-From: 83cdcbd
  • Loading branch information...
laanwj committed Dec 14, 2015
1 parent 9572e49 commit f3ad81220850a4158ab329f5279f7530cbb70a87
Showing with 4 additions and 2 deletions.
  1. +4 −2 qa/pull-tester/rpc-tests.py
@@ -62,8 +62,10 @@
#Set env vars
buildDir = BUILDDIR
os.environ["BITCOIND"] = buildDir + '/src/bitcoind' + EXEEXT
os.environ["BITCOINCLI"] = buildDir + '/src/bitcoin-cli' + EXEEXT
if "BITCOIND" not in os.environ:
os.environ["BITCOIND"] = buildDir + '/src/bitcoind' + EXEEXT
if "BITCOINCLI" not in os.environ:
os.environ["BITCOINCLI"] = buildDir + '/src/bitcoin-cli' + EXEEXT
#Disable Windows tests by default
if EXEEXT == ".exe" and "-win" not in opts:

0 comments on commit f3ad812

Please sign in to comment.