From 2703412a39c95c811a40c3fff6929e4ce59c3c62 Mon Sep 17 00:00:00 2001 From: Suhas Daftuar Date: Wed, 29 Apr 2015 09:18:33 -0400 Subject: [PATCH] Fix default binary in p2p tests to use environment variable --- qa/rpc-tests/maxblocksinflight.py | 3 ++- 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 4bfe20399..94535822d 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 f61b13dfe..9579db995 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):