|
From: Tom H. <th...@cy...> - 2005-02-13 15:45:31
|
CVS commit by thughes:
Move all the existing filters designed to canonicalise libc stack traces
into a single generic libc filter which is invoked from the basic stderr
filter so that it is applied everywhere.
The new filter also has a list of symbols whose source will be messages
to /...libc... if full debugging information was available and a source
file and line number appeared in the output.
A tests/filter_libc 1.1
M +0 -9 corecheck/tests/filter_fdleak 1.4
M +1 -14 memcheck/tests/filter_stderr 1.12
M +1 -4 none/tests/filter_stderr 1.8
M +3 -4 tests/filter_stderr_basic 1.20
--- valgrind/corecheck/tests/filter_fdleak #1.3:1.4
@@ -13,13 +13,4 @@
$dir/../../tests/filter_test_paths |
-# Anonymise paths like "(in /foo/bar/libc-baz.so)"
-sed "s/(in \/.*libc.*)$/(in \/...libc...)/" |
-
-# Anonymise paths like "xxx (../sysdeps/unix/sysv/linux/quux.c:129)"
-sed "s/(\.\.\/sysdeps\/unix\/sysv\/linux\/.*\.c:[0-9]*)$/(in \/...libc...)/" |
-
-# Anonymise paths like "__libc_start_main (../foo/bar/libc-quux.c:129)"
-sed "s/__libc_\(.*\) (.*)$/__libc_\1 (...libc...)/" |
-
sed s/"^Open AF_UNIX socket [0-9]*: <unknown>/Open AF_UNIX socket .: <unknown>/" |
sed s/"^Open \(AF_UNIX socket\|file descriptor\) [0-9]*: \/dev\/null/Open \\1 .: \/dev\/null/" |
--- valgrind/memcheck/tests/filter_stderr #1.11:1.12
@@ -11,16 +11,3 @@
sed "s/mac_replace_strmem.c:[0-9]*/mac_replace_strmem.c:.../" |
-$dir/../../tests/filter_test_paths |
-
-# Anonymise paths like "(in /foo/bar/libc-baz.so)"
-sed "s/(in \/.*libc.*)$/(in \/...libc...)/" |
-
-# Anonymise paths like "(within /foo/bar/libc-baz.so)"
-sed "s/(within \/.*libc.*)$/(within \/...libc...)/" |
-
-# Anonymise paths like "xxx (../sysdeps/unix/sysv/linux/quux.c:129)"
-sed "s/(\.\.\/sysdeps\/unix\/sysv\/linux\/.*\.c:[0-9]*)$/(in \/...libc...)/" |
-
-# Anonymise paths like "__libc_start_main (../foo/bar/libc-quux.c:129)"
-sed "s/__libc_\(.*\) (.*)$/__libc_\1 (...libc...)/"
-
+$dir/../../tests/filter_test_paths
--- valgrind/none/tests/filter_stderr #1.7:1.8
@@ -6,6 +6,3 @@
# Anonymise addresses
-$dir/../../tests/filter_addresses |
-
-# Anonymise paths like "(in /foo/bar/libc-baz.so)"
-sed "s/(in \/.*libc.*)$/(in \/...libc...)/"
+$dir/../../tests/filter_addresses
--- valgrind/tests/filter_stderr_basic #1.19:1.20
@@ -4,4 +4,6 @@
# startup stuff and pid numbers.
+dir=`dirname $0`
+
# Remove ==pid== and --pid-- and ++pid++ and **pid** strings
sed "s/\(==\|--\|\+\+\|\*\*\)[0-9]\{1,5\}\1 //" |
@@ -29,8 +31,5 @@
# Reduce some libc incompatibility
-sed "s/ __getsockname / getsockname /" |
-sed "s/ __sigaction / sigaction /" |
-sed "s/ __GI___/ __/" |
-sed "s/ __\([a-z]*\)_nocancel / \1 /" |
+$dir/filter_libc |
# Remove line info out of order warnings
|