diff options
| author | Suhas Daftuar <sdaftuar@gmail.com> | 2015-04-29 09:18:33 -0400 |
|---|---|---|
| committer | Suhas Daftuar <sdaftuar@gmail.com> | 2015-04-29 09:18:33 -0400 |
| commit | 2703412a39c95c811a40c3fff6929e4ce59c3c62 (patch) | |
| tree | 97585c3010cafead7e89bc885c47e9eeda250dd7 /qa/rpc-tests | |
| parent | 29bff0e684c3ec0121a0695861b6701c5443707c (diff) | |
| download | bitcoin-2703412a39c95c811a40c3fff6929e4ce59c3c62.tar.xz | |
Fix default binary in p2p tests to use environment variable
Diffstat (limited to 'qa/rpc-tests')
| -rwxr-xr-x | qa/rpc-tests/maxblocksinflight.py | 3 | ||||
| -rwxr-xr-x | qa/rpc-tests/test_framework.py | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/qa/rpc-tests/maxblocksinflight.py b/qa/rpc-tests/maxblocksinflight.py index 4bfe203990..94535822d8 100755 --- a/qa/rpc-tests/maxblocksinflight.py +++ b/qa/rpc-tests/maxblocksinflight.py @@ -77,7 +77,8 @@ class TestManager(NodeConnCB): class MaxBlocksInFlightTest(BitcoinTestFramework): def add_options(self, parser): - parser.add_option("--testbinary", dest="testbinary", default="bitcoind", + parser.add_option("--testbinary", dest="testbinary", + default=os.getenv("BITCOIND", "bitcoind"), help="Binary to test max block requests behavior") def setup_chain(self): diff --git a/qa/rpc-tests/test_framework.py b/qa/rpc-tests/test_framework.py index f61b13dfe6..9579db995c 100755 --- a/qa/rpc-tests/test_framework.py +++ b/qa/rpc-tests/test_framework.py @@ -155,9 +155,11 @@ class ComparisonTestFramework(BitcoinTestFramework): self.num_nodes = 2 def add_options(self, parser): - parser.add_option("--testbinary", dest="testbinary", default="bitcoind", + parser.add_option("--testbinary", dest="testbinary", + default=os.getenv("BITCOIND", "bitcoind"), help="bitcoind binary to test") - parser.add_option("--refbinary", dest="refbinary", default="bitcoind", + parser.add_option("--refbinary", dest="refbinary", + default=os.getenv("BITCOIND", "bitcoind"), help="bitcoind binary to use for reference nodes (if any)") def setup_chain(self): |