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.
This commit is contained in:
1 parent
89fcd3586c
commit
95836c5eba
6 files changed
+7
-18
No files matched your search
@@ -3,7 +3,7 @@
|
||||
# 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
|
||||
# test/functional/test_runner.py and test/util/bitcoin-util-test.py
|
||||
|
||||
[environment]
|
||||
SRCDIR=@abs_top_srcdir@
|
||||
@@ -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)
|
||||
|
||||
@@ -20,7 +20,7 @@ if __name__ == '__main__':
|
||||
import bctest
|
||||
|
||||
config = configparser.ConfigParser()
|
||||
config.read_file(open(os.path.dirname(__file__) + "/config.ini"))
|
||||
config.read_file(open(os.path.dirname(__file__) + "/../config.ini"))
|
||||
|
||||
buildenv = argparse.Namespace(exeext=config["environment"]["EXEEXT"],
|
||||
SRCDIR=config["environment"]["SRCDIR"],
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
# Copyright (c) 2013-2017 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/util/bitcoin-util-test.py
|
||||
|
||||
[environment]
|
||||
SRCDIR=@abs_top_srcdir@
|
||||
BUILDDIR=@abs_top_builddir@
|
||||
EXEEXT=@EXEEXT@
|
||||
Reference in new issue
Block a user