mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7209

Browse Source 
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 committed 2015-12-17 10:57:51 +01:00
2 parents d22245f923 83cdcbdca4
commit cd3f12c61c
1 file changed
+4 -2
Download Patch File Download Diff File Expand all files Collapse all files
qa/pull-tester/rpc-tests.py
+4 -2
View File
@@ -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: