Skip to content

Commit

Permalink
test: don't override BITCOIND and BITCOINCLI if they're set
Browse files Browse the repository at this point in the history
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 17, 2015
1 parent 9572e49 commit f3ad812
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions qa/pull-tester/rpc-tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit f3ad812

Please sign in to comment.