More expected output updates as part of the fix for bug #187048. Should have been...

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_4_BRANCH@9574

diff --git a/drd/tests/tc20_verifywrap.stderr.exp-glibc2.3 b/drd/tests/tc20_verifywrap.stderr.exp-glibc2.3
index a715c838a17acfcdbff0eedc6b0fd0ae7c43c911..0f3f707dbcdd38f315568b995af8630614cc89a0 100644 (file)
--- a/drd/tests/tc20_verifywrap.stderr.exp-glibc2.3
+++ b/drd/tests/tc20_verifywrap.stderr.exp-glibc2.3
@@ -28,21 +28,7 @@ Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
 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)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_trylock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:116)
-
-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)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_trylock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:116)
-
-The object at address 0x........ is not a mutex.
+Mutex not locked: mutex 0x........, recursion count 0, owner 0.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:125)
 mutex 0x........ was first observed at:
@@ -136,4 +122,4 @@ Destroying locked rwlock: rwlock 0x.........
 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)
+ERROR SUMMARY: 13 errors from 13 contexts (suppressed: 0 from 0)

diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3 b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
index 31447acbf9a1d8e8472661452040617e1cb7061f..1c36ddf96bf366af673f8f96c7c1a42e65b9f169 100644 (file)
--- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
+++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
@@ -32,27 +32,13 @@ Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
 
 make pthread_mutex_lock fail: skipped on glibc < 2.4
 
-[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)
-mutex 0x........ was first observed at:
-   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 (locking failed)
-[1/1] mutex_trylock   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)
-mutex 0x........ was first observed at:
-   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 (locking failed)
-[1/1] mutex_unlock    invalid mutex 0x........ rc 0
+[1/1] pre_mutex_lock  mutex 0x........ rc 0 owner 0
+[1/1] post_mutex_lock mutex 0x........ rc 0 owner 0 (locking failed)
+[1/1] mutex_trylock   mutex 0x........ rc 0 owner 0
+[1/1] post_mutex_lock mutex 0x........ rc 0 owner 0 (locking failed)
+[1/1] mutex_unlock    mutex 0x........ rc 0
 
-The object at address 0x........ is not a mutex.
+Mutex not locked: mutex 0x........, recursion count 0, owner 0.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:125)
 mutex 0x........ was first observed at:
@@ -213,4 +199,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: 13 errors from 13 contexts (suppressed: 0 from 0)