Skip to content

Commit f3ad812

Browse files
committed
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
1 parent 9572e49 commit f3ad812

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

qa/pull-tester/rpc-tests.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,10 @@
6262

6363
#Set env vars
6464
buildDir = BUILDDIR
65-
os.environ["BITCOIND"] = buildDir + '/src/bitcoind' + EXEEXT
66-
os.environ["BITCOINCLI"] = buildDir + '/src/bitcoin-cli' + EXEEXT
65+
if "BITCOIND" not in os.environ:
66+
os.environ["BITCOIND"] = buildDir + '/src/bitcoind' + EXEEXT
67+
if "BITCOINCLI" not in os.environ:
68+
os.environ["BITCOINCLI"] = buildDir + '/src/bitcoin-cli' + EXEEXT
6769

6870
#Disable Windows tests by default
6971
if EXEEXT == ".exe" and "-win" not in opts:

0 commit comments

Comments
 (0)