diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d2e6add0e6c5..baa3b148ebf65 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,7 +72,7 @@ jobs: run: | # Run tests on commits after the last merge commit and before the PR head commit # Use clang++, because it is a bit faster and uses less memory than g++ - git rebase --exec "echo Running test-one-commit on \$( git log -1 ) && CC=clang CXX=clang++ cmake -B build -DWERROR=ON -DWITH_MULTIPROCESS=OFF -DBUILD_BENCH=ON -DBUILD_FUZZ_BINARY=ON -DCMAKE_CXX_FLAGS='-Wno-error=unused-member-function' && cmake --build build -j $(nproc) && ctest --output-on-failure --stop-on-failure --test-dir build -j $(nproc) && ./build/test/functional/test_runner.py -j $(( $(nproc) * 2 ))" ${{ env.TEST_BASE }} + git rebase --exec "echo Running test-one-commit on \$( git log -1 ) && CC=clang CXX=clang++ cmake -B build -DWERROR=ON -DWITH_MULTIPROCESS=OFF -DWITH_SV2=OFF -DBUILD_BENCH=ON -DBUILD_FUZZ_BINARY=ON -DCMAKE_CXX_FLAGS='-Wno-error=unused-member-function' && cmake --build build -j $(nproc) && ctest --output-on-failure --stop-on-failure --test-dir build -j $(nproc) && ./build/test/functional/test_runner.py -j $(( $(nproc) * 2 ))" ${{ env.TEST_BASE }} macos-native-arm64: name: ${{ matrix.job-name }} diff --git a/ci/test/00_setup_env_native_asan.sh b/ci/test/00_setup_env_native_asan.sh index d61cf14d18360..784e4d823a8ce 100755 --- a/ci/test/00_setup_env_native_asan.sh +++ b/ci/test/00_setup_env_native_asan.sh @@ -25,6 +25,7 @@ export NO_DEPENDS=1 export GOAL="install" export BITCOIN_CONFIG="\ -DWITH_MULTIPROCESS=OFF \ + -DWITH_SV2=OFF \ -DSANITIZERS=address,float-divide-by-zero,integer,undefined \ -DCMAKE_C_COMPILER=clang-${APT_LLVM_V} \ -DCMAKE_CXX_COMPILER=clang++-${APT_LLVM_V} \ diff --git a/ci/test/00_setup_env_native_fuzz.sh b/ci/test/00_setup_env_native_fuzz.sh index cd67fabb9203e..0474451aedefd 100755 --- a/ci/test/00_setup_env_native_fuzz.sh +++ b/ci/test/00_setup_env_native_fuzz.sh @@ -17,6 +17,7 @@ export RUN_FUZZ_TESTS=true export GOAL="install" export CI_CONTAINER_CAP="--cap-add SYS_PTRACE" # If run with (ASan + LSan), the container needs access to ptrace (https://github.com/google/sanitizers/issues/764) export BITCOIN_CONFIG="\ + -DWITH_SV2=OFF \ -DBUILD_FOR_FUZZING=ON \ -DSANITIZERS=fuzzer,address,undefined,float-divide-by-zero,integer \ -DCMAKE_C_COMPILER=clang-${APT_LLVM_V} \ diff --git a/depends/toolchain.cmake.in b/depends/toolchain.cmake.in index 8d3219df5bb04..b7abb1e0d4f0c 100644 --- a/depends/toolchain.cmake.in +++ b/depends/toolchain.cmake.in @@ -155,6 +155,7 @@ endif() set(multiprocess_packages @multiprocess_packages@) if("${multiprocess_packages}" STREQUAL "") set(WITH_MULTIPROCESS OFF CACHE BOOL "") + set(WITH_SV2 OFF CACHE BOOL "") else() set(WITH_MULTIPROCESS ON CACHE BOOL "") set(Libmultiprocess_ROOT "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "")