File tree Expand file tree Collapse file tree 3 files changed +9
-2
lines changed Expand file tree Collapse file tree 3 files changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -124,6 +124,8 @@ def main(self):
124
124
help = "The seed to use for assigning port numbers (default: current process id)" )
125
125
parser .add_option ("--coveragedir" , dest = "coveragedir" ,
126
126
help = "Write tested RPC commands into this directory" )
127
+ parser .add_option ("--configfile" , dest = "configfile" ,
128
+ help = "Location of the test framework config file" )
127
129
self .add_options (parser )
128
130
(self .options , self .args ) = parser .parse_args ()
129
131
Original file line number Diff line number Diff line change @@ -178,7 +178,10 @@ def main():
178
178
179
179
# Read config generated by configure.
180
180
config = configparser .ConfigParser ()
181
- config .read_file (open (os .path .dirname (__file__ ) + "/config.ini" ))
181
+ configfile = os .path .abspath (os .path .dirname (__file__ )) + "/config.ini"
182
+ config .read_file (open (configfile ))
183
+
184
+ passon_args .append ("--configfile=%s" % configfile )
182
185
183
186
# Set up logging
184
187
logging_level = logging .INFO if args .quiet else logging .DEBUG
Original file line number Diff line number Diff line change @@ -29,7 +29,9 @@ def setup_nodes(self):
29
29
30
30
# Check that bitcoin has been built with ZMQ enabled
31
31
config = configparser .ConfigParser ()
32
- config .read_file (open (os .path .dirname (__file__ ) + "/config.ini" ))
32
+ if not self .options .configfile :
33
+ self .options .configfile = os .path .dirname (__file__ ) + "/config.ini"
34
+ config .read_file (open (self .options .configfile ))
33
35
34
36
if not config ["components" ].getboolean ("ENABLE_ZMQ" ):
35
37
self .log .warning ("bitcoind has not been built with zmq enabled. Skipping zmq tests!" )
You can’t perform that action at this time.
0 commit comments