Skip to content

Commit 49aefc2

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#26843: ci: Fix ci_native_fuzz_msan CONTAINER_NAME
fa4e98c ci: Fix ci_native_fuzz_msan CONTAINER_NAME (MarcoFalke) Pull request description: This avoids a duplicate name with the other msan task, which will lead to errors when running locally: > Error: creating container storage: the container name "ci_native_msan" is already in use by 77350e26f9c36abbb601140cd0b485ead093ff118803c720ca8b10f6bdfa37d2. You have to remove that container to be able to reuse that name: that name is already in use ACKs for top commit: fanquake: ACK fa4e98c hebasto: ACK fa4e98c, I've verified that there are no other duplicated `CONTAINER_NAME`'s values. Tree-SHA512: f1b28b21302c0947912d642c12c2ccad236af6824fd27e68341baddedec24087af738f3226028a0eeb6e0fc7e9f90713fc680855eeb07adc113c4f6e8b03a545
2 parents adc41cf + fa4e98c commit 49aefc2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
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
@@ -12,7 +12,7 @@ export MSAN_FLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit
1212
LIBCXX_FLAGS="-nostdinc++ -stdlib=libc++ -L${LIBCXX_DIR}lib -lc++abi -I${LIBCXX_DIR}include -I${LIBCXX_DIR}include/c++/v1 -lpthread -Wl,-rpath,${LIBCXX_DIR}lib -Wno-unused-command-line-argument"
1313
export MSAN_AND_LIBCXX_FLAGS="${MSAN_FLAGS} ${LIBCXX_FLAGS}"
1414

15-
export CONTAINER_NAME="ci_native_msan"
15+
export CONTAINER_NAME="ci_native_fuzz_msan"
1616
export PACKAGES="clang-12 llvm-12 cmake"
1717
# BDB generates false-positives and will be removed in future
1818
export DEP_OPTS="NO_BDB=1 NO_QT=1 CC='clang' CXX='clang++' CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}' libevent_cflags='${MSAN_FLAGS}' sqlite_cflags='${MSAN_FLAGS}' zeromq_cxxflags='-std=c++17 ${MSAN_AND_LIBCXX_FLAGS}'"

0 commit comments

Comments
 (0)