Skip to content

Commit 9ab5da6

Browse files
author
Claude Code
committed
validation: Apply fixes for Bitcoin backport compliance
- Add BOOST_MULTI_INDEX_ENABLE_SAFE_MODE to native_fuzz CI config - Add BOOST_MULTI_INDEX_ENABLE_SAFE_MODE to native_fuzz_with_valgrind CI config - Add BOOST_MULTI_INDEX_ENABLE_SAFE_MODE to native_multiprocess CI config These changes ensure that all CI jobs using --enable-debug or --enable-fuzz explicitly enable boost multi index safe mode, matching Bitcoin's intent in PR bitcoin#27724 which removed automatic enabling in configure.ac and re-enabled it in specific CI jobs.
1 parent 853821b commit 9ab5da6

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

ci/test/00_setup_env_native_fuzz.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8
99
export CONTAINER_NAME=ci_native_fuzz
1010
export PACKAGES="clang llvm python3 libevent-dev bsdmainutils libboost-dev"
1111
export DEP_OPTS="NO_UPNP=1 DEBUG=1"
12-
export CPPFLAGS="-DDEBUG_LOCKORDER -DARENA_DEBUG"
12+
export CPPFLAGS="-DDEBUG_LOCKORDER -DARENA_DEBUG -DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE"
1313
export PYZMQ=true
1414
export RUN_UNIT_TESTS=false
1515
export RUN_FUNCTIONAL_TESTS=false

ci/test/00_setup_env_native_fuzz_with_valgrind.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ export RUN_FUZZ_TESTS=true
1515
export FUZZ_TESTS_CONFIG="--valgrind"
1616
export GOAL="install"
1717
# Temporarily pin dwarf 4, until valgrind can understand clang's dwarf 5
18-
export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer CC=clang-18 CXX=clang++-18 CFLAGS='-gdwarf-4' CXXFLAGS='-gdwarf-4'"
18+
export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer CC=clang-18 CXX=clang++-18 CFLAGS='-gdwarf-4' CPPFLAGS='-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE' CXXFLAGS='-gdwarf-4'"
1919
export CCACHE_SIZE=200M

ci/test/00_setup_env_native_multiprocess.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export DEP_OPTS="MULTIPROCESS=1 CC=clang-18 CXX=clang++-18"
1313
export RUN_TIDY=true
1414
export GOAL="install"
1515
export TEST_RUNNER_EXTRA="--v2transport"
16-
export BITCOIN_CONFIG="--with-boost-process --enable-debug CC=clang-18 CXX=clang++-18" # Use clang to avoid OOM
16+
export BITCOIN_CONFIG="--with-boost-process --enable-debug CC=clang-18 CXX=clang++-18 CPPFLAGS='-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE'" # Use clang to avoid OOM
1717
# Additional flags for RUN_TIDY
1818
export BITCOIN_CONFIG="${BITCOIN_CONFIG} --disable-hardening CFLAGS='-O0 -g0' CXXFLAGS='-O0 -g0 -Wno-error=documentation'"
1919
export BITCOIND=dash-node # Used in functional tests

0 commit comments

Comments
 (0)