Skip to content

Commit fa21f83

Browse files
author
MarcoFalke
committed
ci: Use G++ in valgrind tasks
1 parent fabd05b commit fa21f83

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

ci/test/00_setup_env_native_fuzz_with_valgrind.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
88

99
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
1010
export CONTAINER_NAME=ci_native_fuzz_valgrind
11-
export PACKAGES="clang-16 llvm-16 libclang-rt-16-dev libevent-dev libboost-dev libsqlite3-dev valgrind"
11+
export PACKAGES="libevent-dev libboost-dev libsqlite3-dev valgrind"
1212
export NO_DEPENDS=1
1313
export RUN_UNIT_TESTS=false
1414
export RUN_FUNCTIONAL_TESTS=false
@@ -17,8 +17,4 @@ export FUZZ_TESTS_CONFIG="--valgrind"
1717
export GOAL="install"
1818
export BITCOIN_CONFIG="\
1919
-DBUILD_FOR_FUZZING=ON \
20-
-DSANITIZERS=fuzzer \
21-
-DCMAKE_C_COMPILER=clang-16 \
22-
-DCMAKE_CXX_COMPILER=clang++-16 \
2320
"
24-
export LLVM_SYMBOLIZER_PATH="/usr/bin/llvm-symbolizer-16"

ci/test/00_setup_env_native_valgrind.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,12 @@ export LC_ALL=C.UTF-8
88

99
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
1010
export CONTAINER_NAME=ci_native_valgrind
11-
export PACKAGES="valgrind clang-16 llvm-16 libclang-rt-16-dev python3-zmq libevent-dev libboost-dev libdb5.3++-dev libzmq3-dev libsqlite3-dev"
11+
export PACKAGES="valgrind python3-zmq libevent-dev libboost-dev libdb5.3++-dev libzmq3-dev libsqlite3-dev"
1212
export USE_VALGRIND=1
1313
export NO_DEPENDS=1
1414
export TEST_RUNNER_EXTRA="--exclude feature_init,rpc_bind,feature_bind_extra" # feature_init excluded for now, see https://github.com/bitcoin/bitcoin/issues/30011 ; bind tests excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547
1515
export GOAL="install"
1616
# TODO enable GUI
1717
export BITCOIN_CONFIG="\
1818
-DWITH_ZMQ=ON -DWITH_BDB=ON -DWARN_INCOMPATIBLE_BDB=OFF -DBUILD_GUI=OFF \
19-
-DCMAKE_C_COMPILER=clang-16 \
20-
-DCMAKE_CXX_COMPILER=clang++-16 \
2119
"

contrib/valgrind.supp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212
# --error-limit=no build/src/test/test_bitcoin
1313
#
1414
# Note that suppressions may depend on OS and/or library versions.
15-
# Tested on:
16-
# * aarch64 (Ubuntu Noble system libs, clang, without gui)
17-
# * x86_64 (Ubuntu Noble system libs, clang, without gui)
15+
# Tested on aarch64 and x86_64 with Ubuntu Noble system libs, using clang-16
16+
# and GCC, without gui.
1817
{
1918
Suppress libdb warning - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=662917
2019
Memcheck:Cond

0 commit comments

Comments
 (0)