Merge pull request #7209

83cdcbd test: don't override BITCOIND and BITCOINCLI if they're set (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan 2015-12-17 10:57:43 +01:00
commit cd3f12c61c
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

@ -62,7 +62,9 @@ for arg in sys.argv[1:]:
#Set env vars
buildDir = BUILDDIR
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