Updated expected output files.

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

diff --git a/exp-drd/tests/tc20_verifywrap.stderr.exp b/exp-drd/tests/tc20_verifywrap.stderr.exp
index 5e52f181e9c5d66aadad052a0ef41249a70a567b..7228c4110371cb4de23af5bfe7e308c4a43f9fce 100644 (file)
--- a/exp-drd/tests/tc20_verifywrap.stderr.exp
+++ b/exp-drd/tests/tc20_verifywrap.stderr.exp
@@ -54,10 +54,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_* ----------------
 
 
@@ -104,4 +100,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: 15 errors from 15 contexts (suppressed: 0 from 0)

diff --git a/exp-drd/tests/tc20_verifywrap2.stderr.exp b/exp-drd/tests/tc20_verifywrap2.stderr.exp
index 7dc3cda41d9834e89ea6ca72cd45716cb71187e6..19944f296ea97c9e2a809b59f42be9e38416b4b5 100644 (file)
--- a/exp-drd/tests/tc20_verifywrap2.stderr.exp
+++ b/exp-drd/tests/tc20_verifywrap2.stderr.exp
@@ -34,19 +34,19 @@ Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
 The object at address 0x........ is not a mutex.
    at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:108)
-[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_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.
@@ -73,14 +73,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_* ----------------
 
@@ -134,6 +130,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