Updated expected output according to glibc 2.8 changes.

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

diff --git a/exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.8 b/exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.8
index 7228c4110371cb4de23af5bfe7e308c4a43f9fce..f06cfff290e693c7cf409b5ab6fc563e42b34e9e 100644 (file)
--- a/exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.8
+++ b/exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.8
@@ -97,10 +97,10 @@ FIXME: can't figure out how to verify wrap of sem_post
 ------------ dealloc of mem holding locks ------------
 
 
-Destroying locked rwlock: rwlock 0x.........
-   at 0x........: main (tc20_verifywrap.c:262)
-
 Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
-   at 0x........: main (tc20_verifywrap.c:262)
+   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
+   by 0x........: (within /lib64/ld-2.8.so)
+   by 0x........: exit (in /...libc...)
+   by 0x........: (below main) (in /...libc...)
 
-ERROR SUMMARY: 15 errors from 15 contexts (suppressed: 0 from 0)
+ERROR SUMMARY: 14 errors from 14 contexts (suppressed: 0 from 0)

diff --git a/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8 b/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
index a43c281f7ef00b079df55d62a272cdb764770916..696f2ba5234e8b892175bf77a1ad03be312ffa91 100644 (file)
--- a/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
+++ b/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
@@ -126,16 +126,16 @@ FIXME: can't figure out how to verify wrap of sem_post
 
 ------------ dealloc of mem holding locks ------------
 
-
-Destroying locked rwlock: rwlock 0x.........
-   at 0x........: main (tc20_verifywrap.c:262)
+[1/1] pre_mutex_lock  recursive mutex 0x........ rc 0 owner 0
+[1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 0
 [1/1] mutex_destroy   error checking mutex 0x........
 
 Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
-   at 0x........: main (tc20_verifywrap.c:262)
+   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
+   by 0x........: (within /lib64/ld-2.8.so)
+   by 0x........: exit (in /...libc...)
+   by 0x........: (below main) (in /...libc...)
 [1/1] mutex_destroy   invalid mutex 0x........
-[1/1] pre_mutex_lock  recursive mutex 0x........ rc 0 owner 0
-[1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 0
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1
 [1/1] pre_mutex_lock  recursive mutex 0x........ rc 0 owner 1
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 1
@@ -183,4 +183,4 @@ Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 1
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1
 
-ERROR SUMMARY: 15 errors from 15 contexts (suppressed: 0 from 0)
+ERROR SUMMARY: 14 errors from 14 contexts (suppressed: 0 from 0)