diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-09-27 11:12:28 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-09-27 11:13:51 -0400 |
| commit | b88dd7c2dbf8daca58306afd1744c4f88049b6df (patch) | |
| tree | 8c3149f03580ee8561e48da24b7e355464890297 /test | |
| parent | edcf29c9da02c26ce8cae9bf2a68628c7543351e (diff) | |
| parent | a2a04a5abb347d52b3ef473f7c80c3c0ffc67a2f (diff) | |
| download | bitcoin-b88dd7c2dbf8daca58306afd1744c4f88049b6df.tar.xz | |
Merge #12246: Bugfix: Only run bitcoin-tx tests when bitcoin-tx is enabled
a2a04a5abb Bugfix: Only run bitcoin-tx tests when bitcoin-tx is enabled (Luke Dashjr)
92af71cea9 configure: Make it possible to build only one of bitcoin-cli or bitcoin-tx (Luke Dashjr)
Pull request description:
Includes #5618 (which the reasons for rejecting no longer hold true)
Tree-SHA512: f30a8e4a2f70166b7cabef77c4674163b3a9da14c6a547d34f00d1056a19bf4d23e22851eea726fad2afc8735d5473ae91122c770b65ac3886663dc20e2c5b70
Diffstat (limited to 'test')
| -rw-r--r-- | test/config.ini.in | 2 | ||||
| -rwxr-xr-x | test/functional/test_framework/test_framework.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/config.ini.in b/test/config.ini.in index a1119dc739..28abee2a3d 100644 --- a/test/config.ini.in +++ b/test/config.ini.in @@ -14,6 +14,6 @@ RPCAUTH=@abs_top_srcdir@/share/rpcauth/rpcauth.py [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_BITCOIN_CLI_TRUE@ENABLE_CLI=true @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=true @ENABLE_ZMQ_TRUE@ENABLE_ZMQ=true diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py index 9a589240a8..97710bd6cd 100755 --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -525,7 +525,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass): config = configparser.ConfigParser() config.read_file(open(self.options.configfile)) - return config["components"].getboolean("ENABLE_UTILS") + return config["components"].getboolean("ENABLE_CLI") def is_wallet_compiled(self): """Checks whether the wallet module was compiled.""" |