|
From: Mark W. <ma...@so...> - 2021-10-12 18:06:58
|
https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=0b86d267c60d5977ae3426475fb73df226ba8c0b commit 0b86d267c60d5977ae3426475fb73df226ba8c0b Author: Mark Wielaard <ma...@kl...> Date: Tue Oct 12 20:01:45 2021 +0200 filter_xml: Filter out '@*' from <fn> symbol names With glibc 2.34 we would start seeing some function names ending in '@*' this was already filtered out using drd/tests/filter_stderr.in but not when using the drd xml tests. This would make drd/tests/thread_name_xml and drd/tests/bar_bad_xml fail. Filter this out in the memcheck/tests/filter_xml script, which is also used by the drd test filters. Tested against glibc 2.34, 2.33 and 2.17 on x86_64. Diff: --- memcheck/tests/filter_xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/memcheck/tests/filter_xml b/memcheck/tests/filter_xml index 6de4e930b5..e8c0b75cf5 100755 --- a/memcheck/tests/filter_xml +++ b/memcheck/tests/filter_xml @@ -11,6 +11,8 @@ sed "s/<obj>.*<\/obj>/<obj>...<\/obj>/" | sed "s/<line>.*<\/line>/<line>...<\/line>/" | sed "s/<dir>.*<\/dir>/<dir>...<\/dir>/" | sed "s/<count>.*<\/count>/<count>...<\/count>/" | +# Filter out @* version symbol function names +sed "s/<fn>\(.*\)\@\*<\/fn>/<fn>\1<\/fn>/" | sed "s/of size [48]</of size N</" | perl -p -e "s/(m_replacemalloc\/)?vg_replace_malloc.c/vg_replace_malloc.c/" | perl -0 -p -e "s/<suppcounts>.*<\/suppcounts>/<suppcounts>...<\/suppcounts>/s" | |