aboutsummaryrefslogtreecommitdiff
path: root/test/functional/test_runner.py
diff options
context:
space:
mode:
authorJohn Newbery <john@johnnewbery.com>2017-03-21 14:47:20 -0400
committerJohn Newbery <john@johnnewbery.com>2017-05-03 14:18:30 -0400
commit95836c5eba4a6cdc835e72189e4b0fe3e9458c5a (patch)
tree748a546968a543fab96e326388e6bd395b484b28 /test/functional/test_runner.py
parent89fcd3586c9714a923b6a3147f60e43d5de74942 (diff)
downloadbitcoin-95836c5eba4a6cdc835e72189e4b0fe3e9458c5a.tar.xz
Use shared config file for functional and util tests
The functional tests and util tests both require a config file that is generated by ./configure. This commit merges those two config files into a single configuration file that can be shared by both tests. The config from config.ini is put into a Namespace object to maintain the interface with bctest.py. A future commit could change this interface to use a dictionary instead of a namespace.
Diffstat (limited to 'test/functional/test_runner.py')
-rwxr-xr-xtest/functional/test_runner.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index 467e1668d1..a805f50557 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -179,7 +179,7 @@ def main():
# Read config generated by configure.
config = configparser.ConfigParser()
- configfile = os.path.abspath(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)