mirror of
https://github.com/kvazar-network/kevacoin.git
synced 2025-01-17 18:40:09 +00:00
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:
commit
cd3f12c61c
@ -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…
x
Reference in New Issue
Block a user