More expected output updates.

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

diff --git a/exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.3 b/exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.3
index 1385cd1ea43e275152eb28a24a45c30924f685c8..dd5494118de2bb114b91564d8272718e34318469 100644 (file)
--- a/exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.3
+++ b/exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.3
@@ -53,10 +53,6 @@ FIXME: can't figure out how to verify wrap of pthread_cond_signal
 FIXME: can't figure out how to verify wrap of pthread_broadcast_signal
 
 
-Mutex not locked: mutex 0x........, recursion count 0, owner 0.
-   at 0x........: pthread_cond_timedwait* (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:165)
-
 ---------------- pthread_rwlock_* ----------------
 
 
@@ -103,4 +99,7 @@ FIXME: can't figure out how to verify wrap of sem_post
 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)
+
 ERROR SUMMARY: 14 errors from 14 contexts (suppressed: 0 from 0)

diff --git a/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b b/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
index 32b6735a6844666bdce2c098696c74226dd58212..e7226db2a6272434d192581104701d2386bbd529 100644 (file)
--- a/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
+++ b/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
@@ -37,13 +37,13 @@ make pthread_mutex_lock fail: skipped on glibc < 2.4
 The object at address 0x........ is not a mutex.
    at 0x........: pthread_mutex_trylock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:116)
-[1/1] post_mutex_lock invalid mutex 0x........ rc 0 owner 0
+[1/1] post_mutex_lock invalid mutex 0x........ rc 0 owner 0 (locking failed)
 [1/1] pre_mutex_lock  invalid mutex 0x........ rc 0 owner 0
 
 The object at address 0x........ is not a mutex.
    at 0x........: pthread_mutex_timedlock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:121)
-[1/1] post_mutex_lock invalid mutex 0x........ rc 0 owner 0
+[1/1] post_mutex_lock invalid mutex 0x........ rc 0 owner 0 (locking failed)
 [1/1] mutex_unlock    invalid mutex 0x........ rc 0
 
 The object at address 0x........ is not a mutex.
@@ -70,14 +70,10 @@ FIXME: can't figure out how to verify wrap of pthread_cond_signal
 
 FIXME: can't figure out how to verify wrap of pthread_broadcast_signal
 
-[1/1] mutex_unlock    error checking mutex 0x........ rc 0
-
-Mutex not locked: mutex 0x........, recursion count 0, owner 0.
-   at 0x........: pthread_cond_timedwait* (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:165)
+[1/1] mutex_unlock    error checking mutex 0x........ rc 1
 [1/1] cond_pre_wait 0x........
 [1/1] cond_post_wait 0x........
-[1/1] post_mutex_lock error checking mutex 0x........ rc 0 owner 0
+[1/1] post_mutex_lock error checking mutex 0x........ rc 0 owner 1
 
 ---------------- pthread_rwlock_* ----------------
 
@@ -131,6 +127,9 @@ FIXME: can't figure out how to verify wrap of sem_post
 Destroying locked rwlock: rwlock 0x.........
    at 0x........: main (tc20_verifywrap.c:262)
 [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)
 [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