Updated tc20_verifywrap expected output files.

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

diff --git a/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5 b/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5
index 62a85db61114690cdc603d7104fd9fcd346f4845..73a17ba9a1f28f6fc5cea1f44ac7154922b4e5b0 100644 (file)
--- a/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5
+++ b/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5
@@ -28,28 +28,7 @@ mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:100)
 
-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)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-
-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_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-
-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_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-
-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:
@@ -149,4 +128,4 @@ mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:145)
 
-ERROR SUMMARY: 16 errors from 16 contexts (suppressed: 0 from 0)
+ERROR SUMMARY: 13 errors from 13 contexts (suppressed: 0 from 0)

diff --git a/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5-ppc b/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5-ppc
index 64aa4db778489ec0c24307f97e22fc645b7afc08..e984dd98b12a2dcb469db54b29da589df4befbc3 100644 (file)
--- a/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5-ppc
+++ b/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5-ppc
@@ -28,28 +28,7 @@ mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:100)
 
-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)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-
-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_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-
-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_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-
-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:
@@ -149,4 +128,4 @@ rwlock 0x........ was first observed at:
    at 0x........: pthread_rwlock_init* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:216)
 
-ERROR SUMMARY: 16 errors from 16 contexts (suppressed: 0 from 0)
+ERROR SUMMARY: 13 errors from 13 contexts (suppressed: 0 from 0)

diff --git a/drd/tests/tc20_verifywrap.stderr.exp-glibc2.8 b/drd/tests/tc20_verifywrap.stderr.exp-glibc2.8
index 6e9c12c0f90f38c640a59f4ad260904b4e37a3d7..c11a112379f0693eb02f7356326cf6dbc4668c4d 100644 (file)
--- a/drd/tests/tc20_verifywrap.stderr.exp-glibc2.8
+++ b/drd/tests/tc20_verifywrap.stderr.exp-glibc2.8
@@ -28,28 +28,7 @@ mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:100)
 
-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)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-
-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_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-
-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_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-
-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:

diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3 b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
index 5e0a3d0c33ce16b6dafa318ee3e42adc5c4ffd0f..e1b8ac7ffe23ad2a1e5100dbe450a9a086e5b8b0 100644 (file)
--- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
+++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
@@ -169,7 +169,7 @@ Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:145)
-[1/1] mutex_destroy   invalid mutex 0x........ rc 0 owner 0
+[1/1] mutex_destroy   mutex 0x........ rc 0 owner 0
 [1/1] mutex_trylock   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

diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
index cc9e1e9c733aa919d1c29baff6018c6acb82b305..022e5b995751df2610b821cb1146bcca804da1a5 100644 (file)
--- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
+++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
@@ -169,7 +169,7 @@ Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:145)
-[1/1] mutex_destroy   invalid mutex 0x........ rc 0 owner 0
+[1/1] mutex_destroy   mutex 0x........ rc 0 owner 0
 [1/1] mutex_trylock   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

diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5 b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5
index 5e38246cd9b03d26428722088e282dd540d35d22..93d76be8de58eaebadc4e0bf786b2cb9a1be1d78 100644 (file)
--- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5
+++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5
@@ -32,36 +32,15 @@ Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:100)
-[1/1] mutex_trylock   invalid mutex 0x........ rc 0 owner 0
-
-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)
-mutex 0x........ was first observed at:
-   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 (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)
-mutex 0x........ was first observed at:
-   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 (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_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-[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] mutex_trylock   mutex 0x........ rc 0 owner 0
+[1/1] post_mutex_lock mutex 0x........ rc 0 owner 0 (locking failed)
+[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:
@@ -178,7 +157,7 @@ Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:145)
-[1/1] mutex_destroy   invalid mutex 0x........ rc 0 owner 0
+[1/1] mutex_destroy   mutex 0x........ rc 0 owner 0
 [1/1] mutex_trylock   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
@@ -228,4 +207,4 @@ mutex 0x........ was first observed at:
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 1
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1
 
-ERROR SUMMARY: 16 errors from 16 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.5-ppc b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc
index 9198398b6ad0e60c07eb145f726a69eb7d74b9d2..fdaf8281131ebd61d79759a42199fe0c5a3b9d93 100644 (file)
--- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc
+++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc
@@ -32,36 +32,15 @@ Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:100)
-[1/1] mutex_trylock   invalid mutex 0x........ rc 0 owner 0
-
-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)
-mutex 0x........ was first observed at:
-   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 (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)
-mutex 0x........ was first observed at:
-   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 (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_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-[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] mutex_trylock   mutex 0x........ rc 0 owner 0
+[1/1] post_mutex_lock mutex 0x........ rc 0 owner 0 (locking failed)
+[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:
@@ -228,4 +207,4 @@ rwlock 0x........ was first observed at:
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 1
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1
 
-ERROR SUMMARY: 16 errors from 16 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.8 b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
index cb887e017cb4f5a636ec858eef852b110da14a2d..72524cf4198ba7cd7e7d551d5a6c5775ea7145ab 100644 (file)
--- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
+++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
@@ -32,36 +32,15 @@ Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:100)
-[1/1] mutex_trylock   invalid mutex 0x........ rc 0 owner 0
-
-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)
-mutex 0x........ was first observed at:
-   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 (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)
-mutex 0x........ was first observed at:
-   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 (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_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-[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] mutex_trylock   mutex 0x........ rc 0 owner 0
+[1/1] post_mutex_lock mutex 0x........ rc 0 owner 0 (locking failed)
+[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: