From: Bart Van Assche Date: Fri, 13 Mar 2009 18:19:05 +0000 (+0000) Subject: Updated tc20_verifywrap expected output files. X-Git-Tag: svn/VALGRIND_3_5_0~855 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=019903a6cdda1b1300c40b85ba411f7ce4051cd8;p=thirdparty%2Fvalgrind.git 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 62a85db611..73a17ba9a1 100644 --- 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 64aa4db778..e984dd98b1 100644 --- 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 6e9c12c0f9..c11a112379 100644 --- 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 5e0a3d0c33..e1b8ac7ffe 100644 --- 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 cc9e1e9c73..022e5b9957 100644 --- 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 5e38246cd9..93d76be8de 100644 --- 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 9198398b6a..fdaf828113 100644 --- 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 cb887e017c..72524cf419 100644 --- 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: