From 95836c5eba4a6cdc835e72189e4b0fe3e9458c5a Mon Sep 17 00:00:00 2001 From: John Newbery Date: Tue, 21 Mar 2017 14:47:20 -0400 Subject: 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. --- test/util/bitcoin-util-test.py | 2 +- test/util/config.ini.in | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 test/util/config.ini.in (limited to 'test/util') diff --git a/test/util/bitcoin-util-test.py b/test/util/bitcoin-util-test.py index f85bd13f93..ce0b9ca938 100755 --- a/test/util/bitcoin-util-test.py +++ b/test/util/bitcoin-util-test.py @@ -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"], diff --git a/test/util/config.ini.in b/test/util/config.ini.in deleted file mode 100644 index a1f8f09cec..0000000000 --- a/test/util/config.ini.in +++ /dev/null @@ -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@ -- cgit v1.2.3