Skip to content

Commit bb1383e

Browse files
committed
Merge bitcoin/bitcoin#29742: ci: remove --with-asm=no (secp256k1) from MSAN jobs
61641e2 ci: remove --with-asm usage (secp256k1) (fanquake) c7efee5 ci: use LLVM 18.1.3 in MSAN jobs (fanquake) Pull request description: Bumps LLVM to `18.1.3`: * Includes llvm/llvm-project#86201, which is useful as it removes the need to (possibly) apply a work around when running the CI locally. Drops `--with-asm=no` (only being passed to secp256k1) from the MSAN CI. New MSAN annotations were pulled in as part of #29803. ACKs for top commit: maflcko: lgtm ACK 61641e2 hebasto: ACK 61641e2. Tree-SHA512: da51c9f08a9aacb9dd936c47ef47777a8c84234e4df5b9776647ac94ebe88084b5e7b8182af90cfa01ae183072f6ce5915b73825f66b2567214ab270b2ff7837
2 parents 03e94f8 + 61641e2 commit bb1383e

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

ci/test/00_setup_env_native_fuzz_with_msan.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export PACKAGES="ninja-build"
1717
# BDB generates false-positives and will be removed in future
1818
export DEP_OPTS="DEBUG=1 NO_BDB=1 NO_QT=1 CC=clang CXX=clang++ CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}'"
1919
export GOAL="install"
20-
export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer,memory --disable-hardening --with-asm=no CPPFLAGS='-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE'"
20+
export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer,memory --disable-hardening CPPFLAGS='-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE'"
2121
export USE_MEMORY_SANITIZER="true"
2222
export RUN_UNIT_TESTS="false"
2323
export RUN_FUNCTIONAL_TESTS="false"

ci/test/00_setup_env_native_msan.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export PACKAGES="ninja-build"
1717
# BDB generates false-positives and will be removed in future
1818
export DEP_OPTS="DEBUG=1 NO_BDB=1 NO_QT=1 CC=clang CXX=clang++ CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}'"
1919
export GOAL="install"
20-
export BITCOIN_CONFIG="--with-sanitizers=memory --disable-hardening --with-asm=no"
20+
export BITCOIN_CONFIG="--with-sanitizers=memory --disable-hardening"
2121
export USE_MEMORY_SANITIZER="true"
2222
export RUN_FUNCTIONAL_TESTS="false"
2323
export CCACHE_MAXSIZE=250M

ci/test/01_base_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ if [ -n "$PIP_PACKAGES" ]; then
3636
fi
3737

3838
if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then
39-
${CI_RETRY_EXE} git clone --depth=1 https://github.com/llvm/llvm-project -b "llvmorg-18.1.1" /msan/llvm-project
39+
${CI_RETRY_EXE} git clone --depth=1 https://github.com/llvm/llvm-project -b "llvmorg-18.1.3" /msan/llvm-project
4040

4141
cmake -G Ninja -B /msan/clang_build/ \
4242
-DLLVM_ENABLE_PROJECTS="clang" \

0 commit comments

Comments
 (0)