From: Julian Seward Date: Tue, 17 Oct 2006 01:48:41 +0000 (+0000) Subject: Merge r6142: X-Git-Tag: svn/VALGRIND_3_3_0~598 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbe5eabe5cb02333aa52c362f7ca1da3db442481;p=thirdparty%2Fvalgrind.git Merge r6142: Minor enhancements, including dealing with 6-digit PIDs, dealing with object names of the form "foo.a(bar.o)", and removing debuglog level zero output. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6278 --- diff --git a/tests/filter_stderr_basic b/tests/filter_stderr_basic index a437948180..88d4b3cda7 100755 --- a/tests/filter_stderr_basic +++ b/tests/filter_stderr_basic @@ -6,7 +6,13 @@ dir=`dirname $0` # Remove ==pid== and --pid-- and ++pid++ and **pid** strings -sed "s/\(==\|--\|\+\+\|\*\*\)[0-9]\{1,5\}\1 //" | +sed "s/\(==\|--\|\+\+\|\*\*\)[0-9]\{1,6\}\1 //" | + +# Remove any --pid:0: strings (debuglog level zero output) +sed "/^--[0-9]\{1,6\}:0:*/d" | + +# Remove "WARNING: assuming toc 0x.." strings +sed "/^WARNING: assuming toc 0x*/d" | # Remove "Using valgrind..." line and the following # copyright notice line. Tools have to filter their own line themselves. diff --git a/tests/filter_test_paths b/tests/filter_test_paths index 8aa5a1a957..9192df42b1 100755 --- a/tests/filter_test_paths +++ b/tests/filter_test_paths @@ -3,10 +3,11 @@ # Anonymise paths like "/local/foo/bar/tests/baz/quux" (note "tests" is there) #sed "s/\/.*\/tests\//\/...\/tests\//" -# Remove these two kinds of lines, which tend to appear beneath +# Remove these three kinds of lines, which tend to appear beneath # the stack frame of __libc_start_main # by 0x........: (within /.../tests/malloc2) # by 0x........: ??? (start.S:81) +# by 0x........: function_name (in object_name) sed "s/by 0x........: (within [^)]*)/by 0x........: .../" | \ -sed "s/by 0x........: ??? ([^)]*)/by 0x........: .../" - +sed "s/by 0x........: ??? ([^)]*)/by 0x........: .../" | \ +sed "s/by 0x........: [a-zA-Z0-9_]* (in [^)]*)/by 0x........: .../"