diff options
Diffstat (limited to 'test/functional')
| -rw-r--r-- | test/functional/config.ini.in | 18 | ||||
| -rwxr-xr-x | test/functional/test_runner.py | 2 |
2 files changed, 1 insertions, 19 deletions
diff --git a/test/functional/config.ini.in b/test/functional/config.ini.in deleted file mode 100644 index 29586c555d..0000000000 --- a/test/functional/config.ini.in +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2013-2016 The Bitcoin Core developers -# Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. - -# These environment variables are set by the build process and read by -# test/functional/test_runner.py - -[environment] -SRCDIR=@abs_top_srcdir@ -BUILDDIR=@abs_top_builddir@ -EXEEXT=@EXEEXT@ - -[components] -# Which components are enabled. These are commented out by `configure` if they were disabled when running config. -@ENABLE_WALLET_TRUE@ENABLE_WALLET=true -@BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=true -@BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=true -@ENABLE_ZMQ_TRUE@ENABLE_ZMQ=true 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) |