aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSuhas Daftuar <sdaftuar@gmail.com>2015-04-29 09:18:33 -0400
committerSuhas Daftuar <sdaftuar@gmail.com>2015-04-29 09:18:33 -0400
commit2703412a39c95c811a40c3fff6929e4ce59c3c62 (patch)
tree97585c3010cafead7e89bc885c47e9eeda250dd7
parent29bff0e684c3ec0121a0695861b6701c5443707c (diff)
Fix default binary in p2p tests to use environment variable
-rwxr-xr-xqa/rpc-tests/maxblocksinflight.py3
-rwxr-xr-xqa/rpc-tests/test_framework.py6
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):