Skip to content

Commit 22c8614

Browse files
committed
Merge bitcoin/bitcoin#29848: ci: use Clang 16 for Valgrind
ad21f22 ci: use clang-16 for Valgrind (fanquake) Pull request description: Switch to Ubuntu Noble. Valgrind 3.19 -> 3.22 Clang 14 -> Clang 16 ACKs for top commit: maflcko: lgtm ACK ad21f22 Tree-SHA512: ec79ef9faaec97e34529ae36fff7798f859daca6a1e3563bc50e5d56a56ee4525c736976158a6e950c5b9f810c498d54ab128df984f42441e706033906c2ea3e
2 parents 58446e1 + ad21f22 commit 22c8614

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

ci/test/00_setup_env_native_fuzz_with_valgrind.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export CI_IMAGE_NAME_TAG="docker.io/debian:bookworm"
9+
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
1010
export CONTAINER_NAME=ci_native_fuzz_valgrind
11-
export PACKAGES="clang llvm libclang-rt-dev libevent-dev libboost-dev libsqlite3-dev valgrind"
11+
export PACKAGES="clang-16 llvm-16 libclang-rt-16-dev libevent-dev libboost-dev libsqlite3-dev valgrind"
1212
export NO_DEPENDS=1
1313
export RUN_UNIT_TESTS=false
1414
export RUN_FUNCTIONAL_TESTS=false
1515
export RUN_FUZZ_TESTS=true
1616
export FUZZ_TESTS_CONFIG="--valgrind"
1717
export GOAL="install"
18-
# Temporarily pin dwarf 4, until using Valgrind 3.20 or later
19-
export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer CC=clang CXX=clang++ CFLAGS=-gdwarf-4 CXXFLAGS=-gdwarf-4"
18+
export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer CC=clang-16 CXX=clang++-16"
2019
export CCACHE_MAXSIZE=200M

ci/test/00_setup_env_native_valgrind.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export CI_IMAGE_NAME_TAG="docker.io/debian:bookworm"
9+
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
1010
export CONTAINER_NAME=ci_native_valgrind
11-
export PACKAGES="valgrind clang llvm libclang-rt-dev python3-zmq libevent-dev libboost-dev libdb5.3++-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev libsqlite3-dev"
11+
export PACKAGES="valgrind clang-16 llvm-16 libclang-rt-16-dev python3-zmq libevent-dev libboost-dev libdb5.3++-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev libsqlite3-dev"
1212
export USE_VALGRIND=1
1313
export NO_DEPENDS=1
14-
export TEST_RUNNER_EXTRA="--exclude feature_init,rpc_bind,feature_bind_extra" # Excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547
14+
export TEST_RUNNER_EXTRA="--exclude rpc_bind,feature_bind_extra" # Excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547
1515
export GOAL="install"
16-
# Temporarily pin dwarf 4, until using Valgrind 3.20 or later
17-
export BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=no CC=clang CXX=clang++ CFLAGS=-gdwarf-4 CXXFLAGS=-gdwarf-4" # TODO enable GUI
16+
export BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=no CC=clang-16 CXX=clang++-16" # TODO enable GUI

contrib/valgrind.supp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#
1414
# Note that suppressions may depend on OS and/or library versions.
1515
# Tested on:
16-
# * aarch64 (Debian Bookworm system libs, clang, without gui)
17-
# * x86_64 (Debian Bookworm system libs, clang, without gui)
16+
# * aarch64 (Ubuntu Noble system libs, clang, without gui)
17+
# * x86_64 (Ubuntu Noble system libs, clang, without gui)
1818
{
1919
Suppress libdb warning - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=662917
2020
Memcheck:Cond

0 commit comments

Comments
 (0)