aboutsummaryrefslogtreecommitdiff
path: root/test/functional/test_framework/test_framework.py
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2017-05-03 08:37:14 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2017-05-03 08:47:37 +0200
commit83073de4bdd8026cfaf64fae59328353df601104 (patch)
tree9e3765c20ba8d7f0bea39bc631ac633f42e20d66 /test/functional/test_framework/test_framework.py
parentd4732f3232c3b2c41d8ba9cd001954f33644606e (diff)
parentb8251f63373ed58a05d104f9c1637d2c07b3569e (diff)
downloadbitcoin-83073de4bdd8026cfaf64fae59328353df601104.tar.xz
Merge #10307: [tests] allow zmq test to be run in out-of-tree builds
b8251f6 [tests] allow zmq test to be run in out-of-tree builds (John Newbery) Tree-SHA512: 6946d23bc8a0b57e841a6811989182732d0534989e0e3b94421387f7971379b25a25d238cad22272e04076293275f6e980c8a713fce87ba48c1c4463d9243051
Diffstat (limited to 'test/functional/test_framework/test_framework.py')
-rwxr-xr-xtest/functional/test_framework/test_framework.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
index e912dcbaff..3832f04ecd 100755
--- a/test/functional/test_framework/test_framework.py
+++ b/test/functional/test_framework/test_framework.py
@@ -115,6 +115,8 @@ class BitcoinTestFramework(object):
help="The seed to use for assigning port numbers (default: current process id)")
parser.add_option("--coveragedir", dest="coveragedir",
help="Write tested RPC commands into this directory")
+ parser.add_option("--configfile", dest="configfile",
+ help="Location of the test framework config file")
self.add_options(parser)
(self.options, self.args) = parser.parse_args()