From: Bart Van Assche Date: Wed, 22 Jul 2009 05:27:31 +0000 (+0000) Subject: Updated *.exp files after r10515. X-Git-Tag: svn/VALGRIND_3_5_0~331 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=24208072f7076b716f14da26210b63c264e2f226;p=thirdparty%2Fvalgrind.git Updated *.exp files after r10515. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10517 --- diff --git a/drd/tests/pth_cancel_locked.stderr.exp b/drd/tests/pth_cancel_locked.stderr.exp index ea32d4a7e6..a90746391f 100644 --- a/drd/tests/pth_cancel_locked.stderr.exp +++ b/drd/tests/pth_cancel_locked.stderr.exp @@ -1,6 +1,6 @@ Mutex still locked at thread exit: mutex 0x........, recursion count 1, owner 2. - at 0x........: pthread_join (drd_pthread_intercepts.c:?) + at 0x........: pthread_join* (drd_pthread_intercepts.c:?) by 0x........: main (pth_cancel_locked.c:?) mutex 0x........ was first observed at: at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?) diff --git a/drd/tests/tc22_exit_w_lock.stderr.exp-32bit b/drd/tests/tc22_exit_w_lock.stderr.exp-32bit index 2577eeb4f6..7f27030ab5 100644 --- a/drd/tests/tc22_exit_w_lock.stderr.exp-32bit +++ b/drd/tests/tc22_exit_w_lock.stderr.exp-32bit @@ -3,7 +3,7 @@ Conflicting load by thread 1 at 0x........ size 4 at 0x........: __deallocate_stack (in libpthread-?.?.so) by 0x........: __free_tcb (in libpthread-?.?.so) by 0x........: pthread_join (in libpthread-?.?.so) - by 0x........: pthread_join (drd_pthread_intercepts.c:?) + by 0x........: pthread_join* (drd_pthread_intercepts.c:?) by 0x........: main (tc22_exit_w_lock.c:43) Allocation context: stack_cache_lock (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS Other segment start (thread 2) @@ -15,7 +15,7 @@ Conflicting store by thread 1 at 0x........ size 4 at 0x........: __deallocate_stack (in libpthread-?.?.so) by 0x........: __free_tcb (in libpthread-?.?.so) by 0x........: pthread_join (in libpthread-?.?.so) - by 0x........: pthread_join (drd_pthread_intercepts.c:?) + by 0x........: pthread_join* (drd_pthread_intercepts.c:?) by 0x........: main (tc22_exit_w_lock.c:43) Allocation context: stack_cache_lock (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS Other segment start (thread 2) @@ -27,7 +27,7 @@ Conflicting store by thread 1 at 0x........ size 4 at 0x........: __deallocate_stack (in libpthread-?.?.so) by 0x........: __free_tcb (in libpthread-?.?.so) by 0x........: pthread_join (in libpthread-?.?.so) - by 0x........: pthread_join (drd_pthread_intercepts.c:?) + by 0x........: pthread_join* (drd_pthread_intercepts.c:?) by 0x........: main (tc22_exit_w_lock.c:43) Allocation context: stack_used (offset 4, size 8) in libpthread-?.?.so, libpthread.so.0:Data Other segment start (thread 2) @@ -39,7 +39,7 @@ Conflicting store by thread 1 at 0x........ size 4 at 0x........: __deallocate_stack (in libpthread-?.?.so) by 0x........: __free_tcb (in libpthread-?.?.so) by 0x........: pthread_join (in libpthread-?.?.so) - by 0x........: pthread_join (drd_pthread_intercepts.c:?) + by 0x........: pthread_join* (drd_pthread_intercepts.c:?) by 0x........: main (tc22_exit_w_lock.c:43) Allocation context: stack_used (offset 0, size 8) in libpthread-?.?.so, libpthread.so.0:Data Other segment start (thread 2) @@ -51,7 +51,7 @@ Conflicting load by thread 1 at 0x........ size 4 at 0x........: __deallocate_stack (in libpthread-?.?.so) by 0x........: __free_tcb (in libpthread-?.?.so) by 0x........: pthread_join (in libpthread-?.?.so) - by 0x........: pthread_join (drd_pthread_intercepts.c:?) + by 0x........: pthread_join* (drd_pthread_intercepts.c:?) by 0x........: main (tc22_exit_w_lock.c:43) Allocation context: stack_cache (offset 0, size 8) in libpthread-?.?.so, libpthread.so.0:Data Other segment start (thread 2) @@ -63,7 +63,7 @@ Conflicting store by thread 1 at 0x........ size 4 at 0x........: __deallocate_stack (in libpthread-?.?.so) by 0x........: __free_tcb (in libpthread-?.?.so) by 0x........: pthread_join (in libpthread-?.?.so) - by 0x........: pthread_join (drd_pthread_intercepts.c:?) + by 0x........: pthread_join* (drd_pthread_intercepts.c:?) by 0x........: main (tc22_exit_w_lock.c:43) Allocation context: stack_cache (offset 4, size 8) in libpthread-?.?.so, libpthread.so.0:Data Other segment start (thread 2) @@ -75,7 +75,7 @@ Conflicting load by thread 1 at 0x........ size 4 at 0x........: __deallocate_stack (in libpthread-?.?.so) by 0x........: __free_tcb (in libpthread-?.?.so) by 0x........: pthread_join (in libpthread-?.?.so) - by 0x........: pthread_join (drd_pthread_intercepts.c:?) + by 0x........: pthread_join* (drd_pthread_intercepts.c:?) by 0x........: main (tc22_exit_w_lock.c:43) Allocation context: stack_cache_actsize (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS Other segment start (thread 2) @@ -87,7 +87,7 @@ Conflicting store by thread 1 at 0x........ size 4 at 0x........: __deallocate_stack (in libpthread-?.?.so) by 0x........: __free_tcb (in libpthread-?.?.so) by 0x........: pthread_join (in libpthread-?.?.so) - by 0x........: pthread_join (drd_pthread_intercepts.c:?) + by 0x........: pthread_join* (drd_pthread_intercepts.c:?) by 0x........: main (tc22_exit_w_lock.c:43) Allocation context: stack_cache (offset 0, size 8) in libpthread-?.?.so, libpthread.so.0:Data Other segment start (thread 2) @@ -99,7 +99,7 @@ Conflicting store by thread 1 at 0x........ size 4 at 0x........: __deallocate_stack (in libpthread-?.?.so) by 0x........: __free_tcb (in libpthread-?.?.so) by 0x........: pthread_join (in libpthread-?.?.so) - by 0x........: pthread_join (drd_pthread_intercepts.c:?) + by 0x........: pthread_join* (drd_pthread_intercepts.c:?) by 0x........: main (tc22_exit_w_lock.c:43) Allocation context: stack_cache_actsize (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS Other segment start (thread 2) @@ -111,7 +111,7 @@ Conflicting load by thread 1 at 0x........ size 4 at 0x........: __deallocate_stack (in libpthread-?.?.so) by 0x........: __free_tcb (in libpthread-?.?.so) by 0x........: pthread_join (in libpthread-?.?.so) - by 0x........: pthread_join (drd_pthread_intercepts.c:?) + by 0x........: pthread_join* (drd_pthread_intercepts.c:?) by 0x........: main (tc22_exit_w_lock.c:43) Allocation context: stack_cache_lock (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS Other segment start (thread 2) @@ -123,7 +123,7 @@ Conflicting store by thread 1 at 0x........ size 4 at 0x........: __deallocate_stack (in libpthread-?.?.so) by 0x........: __free_tcb (in libpthread-?.?.so) by 0x........: pthread_join (in libpthread-?.?.so) - by 0x........: pthread_join (drd_pthread_intercepts.c:?) + by 0x........: pthread_join* (drd_pthread_intercepts.c:?) by 0x........: main (tc22_exit_w_lock.c:43) Allocation context: stack_cache_lock (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS Other segment start (thread 2) diff --git a/drd/tests/tc22_exit_w_lock.stderr.exp-64bit b/drd/tests/tc22_exit_w_lock.stderr.exp-64bit index a2fa1fe9ef..090a0c104d 100644 --- a/drd/tests/tc22_exit_w_lock.stderr.exp-64bit +++ b/drd/tests/tc22_exit_w_lock.stderr.exp-64bit @@ -1,6 +1,6 @@ Mutex still locked at thread exit: mutex 0x........, recursion count 1, owner 3. - at 0x........: pthread_join (drd_pthread_intercepts.c:?) + at 0x........: pthread_join* (drd_pthread_intercepts.c:?) by 0x........: main (tc22_exit_w_lock.c:43) mutex 0x........ was first observed at: at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)