Skip to content

Commit 87b5b00

Browse files
committed
Merge bitcoin/bitcoin#24259: test: Remove unused valgrind suppressions
fa4b619 test: Remove unused valgrind suppressions (MarcoFalke) faccb2d test: Exclude broken feature_init for now (MarcoFalke) fa086d8 test: Properly skip feature_syscall_sandbox in valgrind (MarcoFalke) Pull request description: ACKs for top commit: fanquake: ACK fa4b619 Tree-SHA512: 5be1a8f288182d386531a033ae7258f753dd655dfa1746a52b65622a0359c2b7143a25b49c0747538308eed606a691847d2f59a5a0382b7751b8de7172adf0d3
2 parents eca694a + fa4b619 commit 87b5b00

File tree

4 files changed

+6
-23
lines changed

4 files changed

+6
-23
lines changed

ci/test/00_setup_env_native_valgrind.sh

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

77
export LC_ALL=C.UTF-8
88

9-
export DOCKER_NAME_TAG="ubuntu:20.04"
9+
export DOCKER_NAME_TAG="ubuntu:22.04"
1010
export CONTAINER_NAME=ci_native_valgrind
1111
export PACKAGES="valgrind clang llvm python3-zmq libevent-dev bsdmainutils libboost-dev libboost-test-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="--nosandbox --exclude rpc_bind,feature_bind_extra" # Excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547
14+
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"
1616
export BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=no CC=clang CXX=clang++" # TODO enable GUI

ci/test/00_setup_env_s390x.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ fi
2020
export CONTAINER_NAME=ci_s390x
2121
export DOCKER_NAME_TAG="debian:bookworm"
2222
export TEST_RUNNER_ENV="LC_ALL=C"
23-
export TEST_RUNNER_EXTRA="--exclude rpc_bind,feature_bind_extra" # Excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547
23+
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
2424
export RUN_FUNCTIONAL_TESTS=true
2525
export GOAL="install"
2626
export BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests" # GUI tests disabled for now, see https://github.com/bitcoin/bitcoin/issues/23730

contrib/valgrind.supp

Lines changed: 2 additions & 19 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 (Ubuntu 20.04 system libs, without gui)
17-
# * x86_64 (Ubuntu 18.04 system libs, without gui)
16+
# * aarch64 (Ubuntu 22.04 system libs, clang, without gui)
17+
# * x86_64 (Ubuntu 22.04 system libs, clang, without gui)
1818
{
1919
Suppress libstdc++ warning - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65434
2020
Memcheck:Leak
@@ -112,12 +112,6 @@
112112
...
113113
fun:GetCoin
114114
}
115-
{
116-
Suppress wcsnrtombs glibc SSE4 warning (could be related: https://stroika.atlassian.net/browse/STK-626)
117-
Memcheck:Addr16
118-
fun:__wcsnlen_sse4_1
119-
fun:wcsnrtombs
120-
}
121115
{
122116
Suppress boost warning
123117
Memcheck:Leak
@@ -128,17 +122,6 @@
128122
fun:_ZN5boost9unit_test14unit_test_mainEPFbvEiPPc
129123
fun:main
130124
}
131-
{
132-
Suppress boost still reachable memory warning
133-
Memcheck:Leak
134-
match-leak-kinds: reachable
135-
fun:_Znwm
136-
...
137-
fun:_M_construct_aux<char*>
138-
fun:_M_construct<char*>
139-
fun:basic_string
140-
fun:path
141-
}
142125
{
143126
Suppress LogInstance still reachable memory warning
144127
Memcheck:Leak

test/functional/feature_syscall_sandbox.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def set_test_params(self):
1414
def skip_test_if_missing_module(self):
1515
if not self.is_syscall_sandbox_compiled():
1616
raise SkipTest("bitcoind has not been built with syscall sandbox enabled.")
17-
if self.options.nosandbox:
17+
if self.disable_syscall_sandbox:
1818
raise SkipTest("--nosandbox passed to test runner.")
1919

2020
def run_test(self):

0 commit comments

Comments
 (0)