Skip to content

Commit 86133df

Browse files
author
MacroFake
committed
Merge bitcoin/bitcoin#25662: contrib: prune valgrind suppressions
a08c972 contrib: remove unneeded valgrind suppressions (fanquake) cc5b39e ci: better pin to dwarf4 in valgrind job (fanquake) Pull request description: Prune some unneeded suppressions. Running either valgrind job locally these are no-longer needed. Top commit has no ACKs. Tree-SHA512: e191f121d545efb428fa1a0ca40f843593dd95e9895313d764364ed1fb409105a0ac264d1a67dc024ee241afa64a193a241d12be9abbe0549a24006fe845bd9c
2 parents b8067cd + a08c972 commit 86133df

File tree

3 files changed

+2
-23
lines changed

3 files changed

+2
-23
lines changed

ci/test/00_setup_env_native_fuzz_with_valgrind.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ export RUN_FUZZ_TESTS=true
1616
export FUZZ_TESTS_CONFIG="--valgrind"
1717
export GOAL="install"
1818
# Temporarily pin dwarf 4, until valgrind can understand clang's dwarf 5
19-
export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer CC=clang CXX=clang++ CXXFLAGS='-fdebug-default-version=4'"
19+
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ 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"
1616
# Temporarily pin dwarf 4, until valgrind can understand clang's dwarf 5
17-
export BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=no CC=clang CXX=clang++ CXXFLAGS='-fdebug-default-version=4'" # TODO enable GUI
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

contrib/valgrind.supp

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,6 @@
6464
...
6565
obj:*/libdb_cxx-*.so
6666
}
67-
{
68-
Suppress leaks on init
69-
Memcheck:Leak
70-
...
71-
fun:_Z11AppInitMainR11NodeContext
72-
}
7367
{
7468
Suppress leaks on shutdown
7569
Memcheck:Leak
@@ -82,21 +76,6 @@
8276
...
8377
obj:/usr/lib64/libgdk-3.so.0.2404.7
8478
}
85-
{
86-
Suppress leveldb warning (leveldb::InitModule()) - https://github.com/google/leveldb/issues/113
87-
Memcheck:Leak
88-
match-leak-kinds: reachable
89-
fun:_Znwm
90-
fun:_ZN7leveldbL10InitModuleEv
91-
}
92-
{
93-
Suppress leveldb warning (leveldb::Env::Default()) - https://github.com/google/leveldb/issues/113
94-
Memcheck:Leak
95-
match-leak-kinds: reachable
96-
fun:_Znwm
97-
...
98-
fun:_ZN7leveldbL14InitDefaultEnvEv
99-
}
10079
{
10180
Suppress leveldb leak
10281
Memcheck:Leak

0 commit comments

Comments
 (0)