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
This commit is contained in:
commit
83073de4bd
3 changed files with 9 additions and 2 deletions
|
@ -115,6 +115,8 @@ class BitcoinTestFramework(object):
|
||||||
help="The seed to use for assigning port numbers (default: current process id)")
|
help="The seed to use for assigning port numbers (default: current process id)")
|
||||||
parser.add_option("--coveragedir", dest="coveragedir",
|
parser.add_option("--coveragedir", dest="coveragedir",
|
||||||
help="Write tested RPC commands into this directory")
|
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.add_options(parser)
|
||||||
(self.options, self.args) = parser.parse_args()
|
(self.options, self.args) = parser.parse_args()
|
||||||
|
|
||||||
|
|
|
@ -178,7 +178,10 @@ def main():
|
||||||
|
|
||||||
# Read config generated by configure.
|
# Read config generated by configure.
|
||||||
config = configparser.ConfigParser()
|
config = configparser.ConfigParser()
|
||||||
config.read_file(open(os.path.dirname(__file__) + "/config.ini"))
|
configfile = os.path.abspath(os.path.dirname(__file__)) + "/config.ini"
|
||||||
|
config.read_file(open(configfile))
|
||||||
|
|
||||||
|
passon_args.append("--configfile=%s" % configfile)
|
||||||
|
|
||||||
# Set up logging
|
# Set up logging
|
||||||
logging_level = logging.INFO if args.quiet else logging.DEBUG
|
logging_level = logging.INFO if args.quiet else logging.DEBUG
|
||||||
|
|
|
@ -29,7 +29,9 @@ class ZMQTest (BitcoinTestFramework):
|
||||||
|
|
||||||
# Check that bitcoin has been built with ZMQ enabled
|
# Check that bitcoin has been built with ZMQ enabled
|
||||||
config = configparser.ConfigParser()
|
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"):
|
if not config["components"].getboolean("ENABLE_ZMQ"):
|
||||||
self.log.warning("bitcoind has not been built with zmq enabled. Skipping zmq tests!")
|
self.log.warning("bitcoind has not been built with zmq enabled. Skipping zmq tests!")
|
||||||
|
|
Loading…
Reference in a new issue