Skip to content

Commit 67dc002

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#24735: ci: use DWARF-4 for Valgrind jobs
15893a0 supp: remove Boost Valgrind suppression (fanquake) b0740fd ci: use DWARF-4 for Valgrind CI job (fanquake) Pull request description: [clang-14 defaults to using DWARF-5](https://releases.llvm.org/14.0.0/tools/clang/docs/ReleaseNotes.html#dwarf-support-in-clang), which breaks vlagrinds (3.18) ability to parse debug info. Valgrind [claims to support DWARF-5](https://valgrind.org/docs/manual/dist.news.html) from version 3.18 onwards, but maybe that only works when compiling with GCC. Explicitly use DWARF-4 for now. Note that from 11.0 [GCC also defaults to using DWARF-5](https://www.gnu.org/software/gcc/gcc-11/changes.html). Also remove a Boost related suppression. Top commit has no ACKs. Tree-SHA512: e4f476170ac5ccbb43d26e990b24753bda3985b2ac5c8a32e74d2d1d64d1b3a2d80a90fbab345f0a9e404eac7fbd783c20147379208e615d526657e8a57890ca
2 parents 83b26cb + 15893a0 commit 67dc002

File tree

3 files changed

+4
-12
lines changed

3 files changed

+4
-12
lines changed

ci/test/00_setup_env_native_fuzz_with_valgrind.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@ export RUN_FUNCTIONAL_TESTS=false
1515
export RUN_FUZZ_TESTS=true
1616
export FUZZ_TESTS_CONFIG="--valgrind"
1717
export GOAL="install"
18-
export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer CC=clang CXX=clang++"
18+
# 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'"
1920
export CCACHE_SIZE=200M

ci/test/00_setup_env_native_valgrind.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ 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-
export BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=no CC=clang CXX=clang++" # TODO enable GUI
16+
# 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

contrib/valgrind.supp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,6 @@
112112
...
113113
fun:GetCoin
114114
}
115-
{
116-
Suppress boost warning
117-
Memcheck:Leak
118-
fun:_Znwm
119-
...
120-
fun:_ZN5boost9unit_test9framework5state17execute_test_treeEmjPKNS2_23random_generator_helperE
121-
fun:_ZN5boost9unit_test9framework3runEmb
122-
fun:_ZN5boost9unit_test14unit_test_mainEPFbvEiPPc
123-
fun:main
124-
}
125115
{
126116
Suppress LogInstance still reachable memory warning
127117
Memcheck:Leak

0 commit comments

Comments
 (0)