diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-05-03 08:37:14 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-05-03 08:47:37 +0200 |
| commit | 83073de4bdd8026cfaf64fae59328353df601104 (patch) | |
| tree | 9e3765c20ba8d7f0bea39bc631ac633f42e20d66 /test/functional/zmq_test.py | |
| parent | d4732f3232c3b2c41d8ba9cd001954f33644606e (diff) | |
| parent | b8251f63373ed58a05d104f9c1637d2c07b3569e (diff) | |
| download | bitcoin-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/zmq_test.py')
| -rwxr-xr-x | test/functional/zmq_test.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/functional/zmq_test.py b/test/functional/zmq_test.py index a72630406e..918e13bcd4 100755 --- a/test/functional/zmq_test.py +++ b/test/functional/zmq_test.py @@ -29,7 +29,9 @@ class ZMQTest (BitcoinTestFramework): # Check that bitcoin has been built with ZMQ enabled config = configparser.ConfigParser() - config.read_file(open(os.path.dirname(__file__) + "/config.ini")) + if not self.options.configfile: + self.options.configfile = os.path.dirname(__file__) + "/config.ini" + config.read_file(open(self.options.configfile)) if not config["components"].getboolean("ENABLE_ZMQ"): self.log.warning("bitcoind has not been built with zmq enabled. Skipping zmq tests!") |