From 1ea75505d18eea8e5f00f08d1e9e5b348691c7c0 Mon Sep 17 00:00:00 2001 From: Sjors Provoost Date: Sat, 5 Oct 2024 14:29:00 +0200 Subject: [PATCH] ci: enable multiprocess for non-depends jobs Except Windows --- ci/test/00_setup_env_native_tidy.sh | 9 ++++++++- ci/test/03_test_script.sh | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ci/test/00_setup_env_native_tidy.sh b/ci/test/00_setup_env_native_tidy.sh index cc1dea09cbfdf1..63c7a071cc3f88 100755 --- a/ci/test/00_setup_env_native_tidy.sh +++ b/ci/test/00_setup_env_native_tidy.sh @@ -18,7 +18,14 @@ export RUN_CHECK_DEPS=true export RUN_TIDY=true export GOAL="install" export BITCOIN_CONFIG="\ - -DWITH_ZMQ=ON -DBUILD_GUI=ON -DBUILD_BENCH=ON -DWITH_MINIUPNPC=ON -DWITH_USDT=ON -DWITH_BDB=ON -DWARN_INCOMPATIBLE_BDB=OFF \ + -DWITH_MULTIPROCESS=ON \ + -DWITH_ZMQ=ON \ + -DBUILD_GUI=ON \ + -DBUILD_BENCH=ON \ + -DWITH_MINIUPNPC=ON \ + -DWITH_USDT=ON \ + -DWITH_BDB=ON \ + -DWARN_INCOMPATIBLE_BDB=OFF \ -DENABLE_HARDENING=OFF \ -DCMAKE_C_COMPILER=clang-${TIDY_LLVM_V} \ -DCMAKE_CXX_COMPILER=clang++-${TIDY_LLVM_V} \ diff --git a/ci/test/03_test_script.sh b/ci/test/03_test_script.sh index 1c1b5fa545b0cb..d8bc05238d3796 100755 --- a/ci/test/03_test_script.sh +++ b/ci/test/03_test_script.sh @@ -106,6 +106,10 @@ fi BITCOIN_CONFIG_ALL="-DBUILD_BENCH=ON -DBUILD_FUZZ_BINARY=ON" if [ -z "$NO_DEPENDS" ]; then BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} -DCMAKE_TOOLCHAIN_FILE=$DEPENDS_DIR/$HOST/toolchain.cmake" +else + if [[ $HOST != *-mingw32 ]]; then + BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} -DWITH_MULTIPROCESS=ON" + fi fi if [ -z "$NO_WERROR" ]; then BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} -DWERROR=ON"