Converted to new mutex error message format.

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

diff --git a/exp-drd/tests/tc20_verifywrap.stderr.exp2 b/exp-drd/tests/tc20_verifywrap.stderr.exp2
index 73b095eeefae7b9aedd8d405d8daa205671940b7..71796e0487bb0638dcac0d8ce881a89a0e248f87 100644 (file)
--- a/exp-drd/tests/tc20_verifywrap.stderr.exp2
+++ b/exp-drd/tests/tc20_verifywrap.stderr.exp2
@@ -16,18 +16,22 @@ Other segment end (thread 2)
 ---------------- pthread_mutex_lock et al ----------------
 
 
-Destroying locked mutex / mutex 0x........ (recursion count 1, owner 1)
+Destroying locked mutex: address 0x........, recursion count 1, owner 1.
    at 0x........: pthread_mutex_destroy (drd_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:102)
 
-Not a mutex
+Destroying locked mutex: address 0x........, recursion count 1, owner 1.
+   at 0x........: pthread_mutex_destroy (drd_intercepts.c:?)
+   by 0x........: main (tc20_verifywrap.c:102)
+
+Mutex not locked: address 0x........, recursion count 0, owner 0.
    at 0x........: pthread_mutex_unlock (drd_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:125)
 
 ---------------- pthread_cond_wait et al ----------------
 
 
-Not a mutex
+Mutex not locked: address 0x........, recursion count 0, owner 0.
    at 0x........: pthread_cond_wait* (drd_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:147)
 
@@ -60,4 +64,7 @@ FIXME: can't figure out how to verify wrap of sem_post
 ------------ dealloc of mem holding locks ------------
 
 
-ERROR SUMMARY: 4 errors from 4 contexts (suppressed: 0 from 0)
+Destroying locked mutex: address 0x........, recursion count 1, owner 1.
+   at 0x........: main (tc20_verifywrap.c:262)
+
+ERROR SUMMARY: 6 errors from 6 contexts (suppressed: 0 from 0)

diff --git a/exp-drd/tests/tc22_exit_w_lock.stderr.exp-64bit b/exp-drd/tests/tc22_exit_w_lock.stderr.exp-64bit
index 8cdf78058c6343c8409f64ce1ef11a23e6ecc65a..bcf8ef687d1542cedfb149ad352ee7c9e897f159 100644 (file)
--- a/exp-drd/tests/tc22_exit_w_lock.stderr.exp-64bit
+++ b/exp-drd/tests/tc22_exit_w_lock.stderr.exp-64bit
@@ -120,4 +120,8 @@ Other segment start (thread 2)
 Other segment end (thread 2)
    (thread finished, call stack no longer available)
 
-ERROR SUMMARY: 11 errors from 11 contexts (suppressed: 0 from 0)
+Mutex still locked at thread exit: address 0x........, recursion count 1, owner 3.
+   at 0x........: pthread_join (drd_intercepts.c:?)
+   by 0x........: main (tc22_exit_w_lock.c:43)
+
+ERROR SUMMARY: 12 errors from 12 contexts (suppressed: 0 from 0)