diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2017-06-06 23:54:23 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-06-06 23:55:24 +0200 |
| commit | 75e898c094eea533d1dfaf141c6afccc3072c49f (patch) | |
| tree | b67867667c43729f86699d0d7343a8ae5692de9d /test/functional/test_runner.py | |
| parent | 2805d606bc46bf5589093a1b92d3542c13ce50c2 (diff) | |
| parent | 8ad5bdef781d9b3009030287e5c99341e6933007 (diff) | |
| download | bitcoin-75e898c094eea533d1dfaf141c6afccc3072c49f.tar.xz | |
Merge #10331: Share config between util and functional tests
8ad5bde Merge bctest.py into bitcoin-util-test.py (John Newbery)
95836c5 Use shared config file for functional and util tests (John Newbery)
89fcd35 Use an .ini config file for environment vars in bitcoin-util-test.py (John Newbery)
e9265df Change help_text in bitcoin-util-test.py to a docstring. (John Newbery)
ce58e93 Change bitcoin-util-test.py to use Python3 (John Newbery)
Tree-SHA512: 66dab0b4a8546aee0dfaef134a165f1447aff4c0ec335754bbc7d9e55909721c62f09cdbf4b22d02ac1fcd5a9b66780f91e1cc4d8687fae7288cc9072a23a78f
Diffstat (limited to 'test/functional/test_runner.py')
| -rwxr-xr-x | test/functional/test_runner.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index b2aee7c739..4702f2d773 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -180,7 +180,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) |