Merge pull request bitcoin#7209

83cdcbd test: don't override BITCOIND and BITCOINCLI if they're set (Wladimir J. van der Laan)
knocte · Dec 17, 2015 · cd3f12c · cd3f12c
2 parents d22245f + 83cdcbd
commit cd3f12c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
@@ -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: