From 95836c5eba4a6cdc835e72189e4b0fe3e9458c5a Mon Sep 17 00:00:00 2001 From: John Newbery Date: Tue, 21 Mar 2017 14:47:20 -0400 Subject: [PATCH] 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. --- .gitignore | 2 +- configure.ac | 6 +++--- test/{functional => }/config.ini.in | 2 +- test/functional/test_runner.py | 2 +- test/util/bitcoin-util-test.py | 2 +- test/util/config.ini.in | 11 ----------- 6 files changed, 7 insertions(+), 18 deletions(-) rename test/{functional => }/config.ini.in (90%) delete mode 100644 test/util/config.ini.in diff --git a/.gitignore b/.gitignore index aa37e381e..60c26dae8 100644 --- a/.gitignore +++ b/.gitignore @@ -100,7 +100,7 @@ coverage_percent.txt linux-coverage-build linux-build win32-build -test/functional/config.ini +test/config.ini test/cache/* !src/leveldb*/Makefile diff --git a/configure.ac b/configure.ac index 26a9d082c..13de01515 100644 --- a/configure.ac +++ b/configure.ac @@ -1160,7 +1160,7 @@ AC_SUBST(EVENT_PTHREADS_LIBS) AC_SUBST(ZMQ_LIBS) AC_SUBST(PROTOBUF_LIBS) AC_SUBST(QR_LIBS) -AC_CONFIG_FILES([Makefile src/Makefile doc/man/Makefile share/setup.nsi share/qt/Info.plist test/functional/config.ini test/util/config.ini]) +AC_CONFIG_FILES([Makefile src/Makefile doc/man/Makefile share/setup.nsi share/qt/Info.plist test/config.ini]) AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/split-debug.sh]) AC_CONFIG_FILES([doc/Doxyfile]) AC_CONFIG_LINKS([test/functional/test_runner.py:test/functional/test_runner.py]) @@ -1213,8 +1213,8 @@ esac dnl Replace the BUILDDIR path with the correct Windows path if compiling on Native Windows case ${OS} in *Windows*) - sed 's/BUILDDIR="\/\([[a-z]]\)/BUILDDIR="\1:/' test/functional/config.ini > test/functional/config-2.ini - mv test/functional/config-2.ini test/functional/config.ini + sed 's/BUILDDIR="\/\([[a-z]]\)/BUILDDIR="\1:/' test/config.ini > test/config-2.ini + mv test/config-2.ini test/config.ini ;; esac diff --git a/test/functional/config.ini.in b/test/config.ini.in similarity index 90% rename from test/functional/config.ini.in rename to test/config.ini.in index 29586c555..35ee092be 100644 --- a/test/functional/config.ini.in +++ b/test/config.ini.in @@ -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@ diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index 467e1668d..a805f5055 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) diff --git a/test/util/bitcoin-util-test.py b/test/util/bitcoin-util-test.py index f85bd13f9..ce0b9ca93 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 a1f8f09ce..000000000 --- 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@