Browse Source

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.
0.13
Wladimir J. van der Laan 9 years ago
parent
commit
83cdcbdca4
  1. 6
      qa/pull-tester/rpc-tests.py

6
qa/pull-tester/rpc-tests.py

@ -62,8 +62,10 @@ for arg in sys.argv[1:]:
#Set env vars #Set env vars
buildDir = BUILDDIR buildDir = BUILDDIR
os.environ["BITCOIND"] = buildDir + '/src/bitcoind' + EXEEXT if "BITCOIND" not in os.environ:
os.environ["BITCOINCLI"] = buildDir + '/src/bitcoin-cli' + EXEEXT 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 #Disable Windows tests by default
if EXEEXT == ".exe" and "-win" not in opts: if EXEEXT == ".exe" and "-win" not in opts:

Loading…
Cancel
Save