[Valgrind-developers] valgrind: r6278 - trunk/tests

[<sv...@va...>]

Author: sewardj
Date: 2006-10-17 02:48:41 +0100 (Tue, 17 Oct 2006)
New Revision: 6278

Log:
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.

Modified:
   trunk/tests/filter_stderr_basic
   trunk/tests/filter_test_paths


Modified: trunk/tests/filter_stderr_basic
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tests/filter_stderr_basic	2006-10-17 01:48:02 UTC (rev 6277)
+++ trunk/tests/filter_stderr_basic	2006-10-17 01:48:41 UTC (rev 6278)
@@ -6,8 +6,14 @@
 dir=3D`dirname $0`
=20
 # Remove =3D=3Dpid=3D=3D and --pid-- and ++pid++ and **pid** strings=20
-sed "s/\(=3D=3D\|--\|\+\+\|\*\*\)[0-9]\{1,5\}\1 //"             |
+sed "s/\(=3D=3D\|--\|\+\+\|\*\*\)[0-9]\{1,6\}\1 //"             |
=20
+# 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=
.
 sed "/^Using valgrind-.*, a dynamic binary instrumentation framework/ , =
/./ d" |

Modified: trunk/tests/filter_test_paths
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tests/filter_test_paths	2006-10-17 01:48:02 UTC (rev 6277)
+++ trunk/tests/filter_test_paths	2006-10-17 01:48:41 UTC (rev 6278)
@@ -3,10 +3,11 @@
 # Anonymise paths like "/local/foo/bar/tests/baz/quux" (note "tests" is =
there)
 #sed "s/\/.*\/tests\//\/...\/tests\//"
=20
-# 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........: .../"