drd/tests: Make the expected output match the actual output

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

diff --git a/drd/tests/filter_stderr b/drd/tests/filter_stderr
index 70ffae0c003bca5b13ae7f50dae3fb49f2e69a50..2376e17e3f3c85025d649ae7b80b28a49188edfd 100755 (executable)
--- a/drd/tests/filter_stderr
+++ b/drd/tests/filter_stderr
@@ -32,7 +32,7 @@ sed \
 -e "s/ (\([a-zA-Z_]*\.h\):[0-9]*)/ (\1:?)/" \
 -e "s/ (\([a-zA-Z_]*\.cpp\):[0-9]*)/ (\1:?)/" \
 -e "s/\( name [^ ]*\)-[0-9]*\( oflag \)/\1\2/" \
--e '/^    by 0x[0-9a-fA-F.]*: process_dl_debug \(in \/lib.*\/ld-[0-9.]*\.so\)$/d' \
+-e '/^    by 0x[0-9a-fA-F]*: process_dl_debug \(in \/lib.*\/ld-[0-9.]*\.so\)$/d' \
 -e "/^For counts of detected and suppressed errors, rerun with: -v$/d" |
 
 # Remove the message that more than hundred errors have been detected

diff --git a/drd/tests/tc04_free_lock.stderr.exp-s390 b/drd/tests/tc04_free_lock.stderr.exp-s390
index eafb3db1777689ca400065f908342a52ea3ba865..041ae3cc3dba306c1dfdaa8e6eb722fdcd47a4d1 100644 (file)
--- a/drd/tests/tc04_free_lock.stderr.exp-s390
+++ b/drd/tests/tc04_free_lock.stderr.exp-s390
@@ -8,7 +8,6 @@ mutex 0x........ was first observed at:
 
 Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
    at 0x........: bar (tc04_free_lock.c:40)
-   by 0x........: process_dl_debug (in /lib64/ld-2.3.4.so)
    by 0x........: ???
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
@@ -17,7 +16,6 @@ mutex 0x........ was first observed at:
 
 Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
    at 0x........: foo (tc04_free_lock.c:49)
-   by 0x........: process_dl_debug (in /lib64/ld-2.3.4.so)
    by 0x........: ???
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)