Test fixes for systems that have debug info installed for libc and

libpthread.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9353

diff --git a/exp-ptrcheck/tests/filter_stderr b/exp-ptrcheck/tests/filter_stderr
index 27b6eb8463f27d122ed4fa274af525824d7e8366..11e5851a03585ad651cbe5a84bad9bfdccaad0e8 100755 (executable)
--- a/exp-ptrcheck/tests/filter_stderr
+++ b/exp-ptrcheck/tests/filter_stderr
@@ -21,15 +21,15 @@ sed \
 -e "/^Copyright (C) 2003-200., and GNU GPL'd, by OpenWorks Ltd et al.$/d" |
 
 # Tidy up in cases where glibc (+ libdl + libpthread + ld) have
-# been built with debugging information, hence source locs are present
+# been built with debugging information, hence source locs are present.
 sed \
 -e "s/ vfprintf (.*)/ .../" \
 -e "s/ vsprintf (.*)/ .../" \
 -e "s/ sprintf (.*)/ .../" \
 -e "s/ printf (.*)/ .../" \
 -e "s/ strdup (.*)/ .../" \
--e "s/ pthread_key_create.c:[0-9]*/ in \/...libpthread.../" \
--e "s/ genops.c:[0-9]*/ in \/...libc.../" |
+-e "s/(pthread_key_create.c:[0-9]*)/(in \/...libpthread...)/" \
+-e "s/(genops.c:[0-9]*)/(in \/...libc...)/" |
 
 # Anonymise line numbers in h_intercepts.c.
 sed "s/h_intercepts.c:[0-9]*/h_intercepts.c:.../" 

diff --git a/tests/filter_libc b/tests/filter_libc
index 377cdc6019233e1a16e74e09d32062f8762f306a..a89fb89123a148b91c421eaba9024aba4b1e3583 100755 (executable)
--- a/tests/filter_libc
+++ b/tests/filter_libc
@@ -37,6 +37,10 @@ while (<>)
     s/(at.*)__builtin_vec_delete/$1...operator delete[].../;
     s/(at.*)operator delete\[\]\(void\*\)/$1...operator delete[].../;
 
+    # Tidy up in cases where glibc (+ libdl + libpthread + ld) have
+    # been built with debugging information, hence source locs are present.
+    s/\((exit|_exit|brk|sbrk).c:[0-9]*\)/(in \/...libc...)/;
+
     print;
 }