From: Bart Van Assche Date: Wed, 12 Aug 2009 08:21:13 +0000 (+0000) Subject: More expected output updates because of r10783. X-Git-Tag: svn/VALGRIND_3_5_0~62 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a5b58599761459b872576a3a7d72a93624b4d2e9;p=thirdparty%2Fvalgrind.git More expected output updates because of r10783. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10788 --- diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc index 4ea959535e..49cdc7bca9 100644 --- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc +++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc @@ -14,24 +14,25 @@ Other segment start (thread 2) Other segment end (thread 2) (thread finished, call stack no longer available) + ---------------- pthread_mutex_lock et al ---------------- [1] mutex_init invalid mutex 0x........ - The object at address 0x........ is not a mutex. at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:92) + [1] mutex_init mutex 0x........ [1] mutex_trylock mutex 0x........ rc 0 owner 0 [1] post_mutex_lock mutex 0x........ rc 0 owner 0 [1] mutex_destroy mutex 0x........ rc 1 owner 1 - Destroying locked mutex: mutex 0x........, recursion count 1, owner 1. at 0x........: pthread_mutex_destroy (drd_pthread_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:102) mutex 0x........ was first observed at: at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:100) + [1] mutex_trylock mutex 0x........ rc 0 owner 0 [1] post_mutex_lock mutex 0x........ rc 0 owner 0 (locking failed) [1] pre_mutex_lock mutex 0x........ rc 0 owner 0 @@ -39,7 +40,6 @@ mutex 0x........ was first observed at: [1] mutex_trylock mutex 0x........ rc 0 owner 0 [1] post_mutex_lock mutex 0x........ rc 0 owner 0 (locking failed) [1] mutex_unlock mutex 0x........ rc 0 - 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) @@ -47,18 +47,19 @@ mutex 0x........ was first observed at: at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:108) + ---------------- pthread_cond_wait et al ---------------- [1] mutex_init error checking mutex 0x........ [1] cond_init cond 0x........ [1] mutex_unlock error checking mutex 0x........ rc 0 - Mutex not locked: mutex 0x........, recursion count 0, owner 0. at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:147) mutex 0x........ was first observed at: at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:145) + [1] cond_pre_wait cond 0x........ [1] cond_post_wait cond 0x........ [1] cond_post_wait error checking mutex 0x........ rc 0 owner 0 @@ -77,17 +78,16 @@ FIXME: can't figure out how to verify wrap of pthread_broadcast_signal ---------------- pthread_rwlock_* ---------------- - Reader-writer lock not locked by calling thread: rwlock 0x......... at 0x........: pthread_rwlock_unlock (drd_pthread_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:179) rwlock 0x........ was first observed at: at 0x........: pthread_rwlock_init (drd_pthread_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:178) + (1) no error on next line (2) no error on next line (3) ERROR on next line - Reader-writer lock not locked by calling thread: rwlock 0x......... at 0x........: pthread_rwlock_unlock (drd_pthread_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:196) @@ -101,12 +101,12 @@ Reader-writer lock reinitialization: rwlock 0x......... rwlock 0x........ was first observed at: at 0x........: pthread_rwlock_init (drd_pthread_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:186) + (4) no error on next line (5) no error on next line (6) no error on next line (7) no error on next line (8) ERROR on next line - Reader-writer lock not locked by calling thread: rwlock 0x......... at 0x........: pthread_rwlock_unlock (drd_pthread_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:212) @@ -114,11 +114,11 @@ rwlock 0x........ was first observed at: at 0x........: pthread_rwlock_init (drd_pthread_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:186) + ---------------- sem_* ---------------- [1] sem_init 0x........ value 4294967295 [1] sem_init 0x........ value 0 - Semaphore reinitialization: semaphore 0x........ at 0x........: sem_init (drd_pthread_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:231) @@ -126,16 +126,17 @@ semaphore 0x........ was first observed at: at 0x........: sem_init (drd_pthread_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:228) + FIXME: can't figure out how to verify wrap of sem_destroy [1] sem_wait 0x........ value 0 -> 4294967295 - Invalid semaphore: semaphore 0x........ at 0x........: sem_wait (drd_pthread_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:242) semaphore 0x........ was first observed at: at 0x........: sem_init (drd_pthread_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:228) + [1] sem_post 0x........ value 4294967295 -> 0 FIXME: can't figure out how to verify wrap of sem_post @@ -146,7 +147,6 @@ FIXME: can't figure out how to verify wrap of sem_post [1] mutex_destroy mutex 0x........ rc 0 owner 0 [1] mutex_destroy error checking mutex 0x........ rc 1 owner 1 - Destroying locked mutex: mutex 0x........, recursion count 1, owner 1. at 0x........: main (tc20_verifywrap.c:262) mutex 0x........ was first observed at: @@ -158,6 +158,7 @@ Destroying locked rwlock: rwlock 0x......... rwlock 0x........ was first observed at: at 0x........: pthread_rwlock_init (drd_pthread_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:216) + [1] mutex_trylock recursive mutex 0x........ rc 0 owner 0 [1] post_mutex_lock recursive mutex 0x........ rc 0 owner 0 [1] mutex_unlock recursive mutex 0x........ rc 1 diff --git a/drd/tests/tc23_bogus_condwait.stderr.exp-linux-ppc b/drd/tests/tc23_bogus_condwait.stderr.exp-linux-ppc index 90ab60fa7c..d6f9885f19 100644 --- a/drd/tests/tc23_bogus_condwait.stderr.exp-linux-ppc +++ b/drd/tests/tc23_bogus_condwait.stderr.exp-linux-ppc @@ -3,11 +3,11 @@ The object at address 0x........ is not a mutex. at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?) by 0x........: main (tc23_bogus_condwait.c:69) + Process terminating with default action of signal 7 (SIGBUS) Invalid address alignment at address 0x........ at 0x........: (within libpthread-?.?.so) by 0x........: pthread_cond_wait@@GLIBC_2.3.2(within libpthread-?.?.so) by 0x........: main (tc23_bogus_condwait.c:69) - ERROR SUMMARY: 2 errors from 1 contexts (suppressed: 0 from 0)