Skip to content

Commit cd603ed

Browse files
committed
Merge bitcoin/bitcoin#27444: ci: use Debian Bookworm and Valgrind 3.19 in Valgrind jobs
e047ae8 valgrind: update supps for Debian Bookworm. (fanquake) ba29143 ci: use Debian Bookworm and Valgrind 3.19 in Valgrind jobs (fanquake) Pull request description: Switch to using Debian Bookworm and [valgrind 3.19](https://packages.debian.org/bookworm/valgrind) in the Valgrind jobs. Also update the suppressions file. This originally contained a changed to build valgrind 3.20 from source (for improved aarch64 support), but I'll split that into it's own change. Top commit has no ACKs. Tree-SHA512: 73ec162d6e07f8a6767d15c0fc298ec6e1a2ba8ec8f9ea902dbfd0a1e3c491411781beec2f6de66fd15006475dbc024bc512f09aa94e2615b713ba873fac14de
2 parents 6a16732 + e047ae8 commit cd603ed

File tree

3 files changed

+6
-23
lines changed

3 files changed

+6
-23
lines changed

ci/test/00_setup_env_native_fuzz_with_valgrind.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export CI_IMAGE_NAME_TAG="ubuntu:22.04"
9+
export CI_IMAGE_NAME_TAG="debian:bookworm"
1010
export CONTAINER_NAME=ci_native_fuzz_valgrind
1111
export PACKAGES="clang llvm python3 libevent-dev bsdmainutils libboost-dev libsqlite3-dev valgrind"
1212
export NO_DEPENDS=1
@@ -15,6 +15,6 @@ 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 valgrind can understand clang's dwarf 5
18+
# Temporarily pin dwarf 4, until using Valgrind 3.20 or later
1919
export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer CC=clang CXX=clang++ CFLAGS='-gdwarf-4' CXXFLAGS='-gdwarf-4'"
2020
export CCACHE_SIZE=200M

ci/test/00_setup_env_native_valgrind.sh

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

77
export LC_ALL=C.UTF-8
88

9-
export CI_IMAGE_NAME_TAG="ubuntu:22.04"
9+
export CI_IMAGE_NAME_TAG="debian:bookworm"
1010
export CONTAINER_NAME=ci_native_valgrind
1111
export PACKAGES="valgrind clang llvm python3-zmq libevent-dev bsdmainutils libboost-dev libdb5.3++-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev libsqlite3-dev"
1212
export USE_VALGRIND=1
1313
export NO_DEPENDS=1
1414
export TEST_RUNNER_EXTRA="--nosandbox --exclude feature_init,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 valgrind can understand clang's dwarf 5
16+
# Temporarily pin dwarf 4, until using Valgrind 3.20 or later
1717
export BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=no CC=clang CXX=clang++ CFLAGS='-gdwarf-4' CXXFLAGS='-gdwarf-4'" # TODO enable GUI

contrib/valgrind.supp

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,8 @@
1313
#
1414
# Note that suppressions may depend on OS and/or library versions.
1515
# Tested on:
16-
# * aarch64 (Ubuntu 22.04 system libs, clang, without gui)
17-
# * x86_64 (Ubuntu 22.04 system libs, clang, without gui)
18-
{
19-
Suppress libstdc++ warning - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65434
20-
Memcheck:Leak
21-
match-leak-kinds: reachable
22-
fun:malloc
23-
obj:*/libstdc++.*
24-
fun:call_init.part.0
25-
fun:call_init
26-
fun:_dl_init
27-
obj:*/ld-*.so
28-
}
16+
# * aarch64 (Debian Bookworm system libs, clang, without gui)
17+
# * x86_64 (Debian Bookworm system libs, clang, without gui)
2918
{
3019
Suppress libdb warning - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=662917
3120
Memcheck:Cond
@@ -70,12 +59,6 @@
7059
...
7160
fun:_Z8ShutdownR11NodeContext
7261
}
73-
{
74-
Ignore GUI warning
75-
Memcheck:Leak
76-
...
77-
obj:/usr/lib64/libgdk-3.so.0.2404.7
78-
}
7962
{
8063
Suppress leveldb leak
8164
Memcheck:Leak

0 commit comments

Comments
 (0)