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 a437948180889192e5b64af4c23572a246bbbafc..88d4b3cda752abadf0f6c8282fce2e13e0b81ec2 100755 (executable)
--- 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 8aa5a1a957cbf486a31acddaf5c9b3d6f5a8a183..9192df42b1b51fce074310f87189b1a8e374954a 100755 (executable)
--- 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........: .../"