diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-17 10:57:43 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-17 10:57:51 +0100 |
| commit | cd3f12c61ca59df067444a228ddd49241d65c3e4 (patch) | |
| tree | 62ecf018e8e46b02f20af49a0e66822add5d609f | |
| parent | d22245f92375b53eda849aa61aaeb5efd8fc2bf4 (diff) | |
| parent | 83cdcbdca41583a5a754a89f45b04b56cd0df627 (diff) | |
Merge pull request #7209
83cdcbd test: don't override BITCOIND and BITCOINCLI if they're set (Wladimir J. van der Laan)
| -rwxr-xr-x | qa/pull-tester/rpc-tests.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py index 0cb721b033..57b4233449 100755 --- a/qa/pull-tester/rpc-tests.py +++ b/qa/pull-tester/rpc-tests.py @@ -62,8 +62,10 @@ for arg in sys.argv[1:]: #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: |