From fa8acd57cd1b9fcd62abc1eca0cab57b04a52a83 Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Fri, 31 Jul 2026 11:43:44 +0200 Subject: [PATCH] test: Write true/false values in config.ini Omitting values is brittle, because a name mismatch can not be distinguished from a falsy (omitted) value. --- test/CMakeLists.txt | 4 ++-- test/config.ini.in | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 085d4f6b016..241ab7f9bf1 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -9,9 +9,9 @@ function(create_test_config) macro(set_configure_variable var conf_var) if(${var}) - set(${conf_var}_TRUE "") + set(${conf_var}_VALUE true) else() - set(${conf_var}_TRUE "#") + set(${conf_var}_VALUE false) endif() endmacro() diff --git a/test/config.ini.in b/test/config.ini.in index 45b69ded41b..26733b8b58c 100644 --- a/test/config.ini.in +++ b/test/config.ini.in @@ -14,19 +14,19 @@ EXEEXT=@EXEEXT@ RPCAUTH=@abs_top_srcdir@/share/rpcauth/rpcauth.py [components] -# Which components are enabled. These are commented out by cmake if they were disabled during configuration. -@ENABLE_WALLET_TRUE@ENABLE_WALLET=true -@BUILD_BENCH_TRUE@BUILD_BENCH=true -@BUILD_BITCOIN_CLI_TRUE@ENABLE_CLI=true -@BUILD_BITCOIN_TX_TRUE@BUILD_BITCOIN_TX=true -@BUILD_BITCOIN_UTIL_TRUE@ENABLE_BITCOIN_UTIL=true -@BUILD_BITCOIN_CHAINSTATE_TRUE@ENABLE_BITCOIN_CHAINSTATE=true -@BUILD_BITCOIN_WALLET_TRUE@ENABLE_WALLET_TOOL=true -@BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=true -@ENABLE_FUZZ_BINARY_TRUE@ENABLE_FUZZ_BINARY=true -@ENABLE_ZMQ_TRUE@ENABLE_ZMQ=true -@ENABLE_EMBEDDED_ASMAP_TRUE@ENABLE_EMBEDDED_ASMAP=true -@ENABLE_EXTERNAL_SIGNER_TRUE@ENABLE_EXTERNAL_SIGNER=true -@ENABLE_USDT_TRACEPOINTS_TRUE@ENABLE_USDT_TRACEPOINTS=true -@ENABLE_IPC_TRUE@ENABLE_IPC=true -@BUILD_GUI_TRUE@BUILD_GUI=true +# Which components are enabled. +ENABLE_WALLET=@ENABLE_WALLET_VALUE@ +BUILD_BENCH=@BUILD_BENCH_VALUE@ +ENABLE_CLI=@BUILD_BITCOIN_CLI_VALUE@ +BUILD_BITCOIN_TX=@BUILD_BITCOIN_TX_VALUE@ +ENABLE_BITCOIN_UTIL=@BUILD_BITCOIN_UTIL_VALUE@ +ENABLE_BITCOIN_CHAINSTATE=@BUILD_BITCOIN_CHAINSTATE_VALUE@ +ENABLE_WALLET_TOOL=@BUILD_BITCOIN_WALLET_VALUE@ +ENABLE_BITCOIND=@BUILD_BITCOIND_VALUE@ +ENABLE_FUZZ_BINARY=@ENABLE_FUZZ_BINARY_VALUE@ +ENABLE_ZMQ=@ENABLE_ZMQ_VALUE@ +ENABLE_EMBEDDED_ASMAP=@ENABLE_EMBEDDED_ASMAP_VALUE@ +ENABLE_EXTERNAL_SIGNER=@ENABLE_EXTERNAL_SIGNER_VALUE@ +ENABLE_USDT_TRACEPOINTS=@ENABLE_USDT_TRACEPOINTS_VALUE@ +ENABLE_IPC=@ENABLE_IPC_VALUE@ +BUILD_GUI=@BUILD_GUI_VALUE@