Update expected outputs following recent amd64-unwind improvements (??)

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

diff --git a/helgrind/tests/tc20_verifywrap.stderr.exp-glibc27-amd64 b/helgrind/tests/tc20_verifywrap.stderr.exp-glibc27-amd64
index ad3758a1629dfaeb975af13ce4dfdd6c70dc7ffd..cf042ec551951c45c403aec9dd01ea4c664a7e25 100644 (file)
--- a/helgrind/tests/tc20_verifywrap.stderr.exp-glibc27-amd64
+++ b/helgrind/tests/tc20_verifywrap.stderr.exp-glibc27-amd64
@@ -71,12 +71,14 @@ Thread #x's call to pthread_mutex_unlock failed
 ---------------- pthread_cond_wait et al ----------------
 
 Thread #x: pthread_cond_{timed}wait called with un-held mutex
-   at 0x........: pthread_cond_wait@* (hg_intercepts.c:...)
+   at 0x........: pthread_cond_wait_WRK (hg_intercepts.c:...)
+   by 0x........: pthread_cond_wait@* (hg_intercepts.c:...)
    by 0x........: main (tc20_verifywrap.c:147)
 
 Thread #x's call to pthread_cond_wait failed
    with error code 1 (EPERM: Operation not permitted)
-   at 0x........: pthread_cond_wait@* (hg_intercepts.c:...)
+   at 0x........: pthread_cond_wait_WRK (hg_intercepts.c:...)
+   by 0x........: pthread_cond_wait@* (hg_intercepts.c:...)
    by 0x........: main (tc20_verifywrap.c:147)
 
 
@@ -86,12 +88,14 @@ FIXME: can't figure out how to verify wrap of pthread_cond_signal
 FIXME: can't figure out how to verify wrap of pthread_broadcast_signal
 
 Thread #x: pthread_cond_{timed}wait called with un-held mutex
-   at 0x........: pthread_cond_timedwait@* (hg_intercepts.c:...)
+   at 0x........: pthread_cond_timedwait_WRK (hg_intercepts.c:...)
+   by 0x........: pthread_cond_timedwait@* (hg_intercepts.c:...)
    by 0x........: main (tc20_verifywrap.c:165)
 
 Thread #x's call to pthread_cond_timedwait failed
    with error code 22 (EINVAL: Invalid argument)
-   at 0x........: pthread_cond_timedwait@* (hg_intercepts.c:...)
+   at 0x........: pthread_cond_timedwait_WRK (hg_intercepts.c:...)
+   by 0x........: pthread_cond_timedwait@* (hg_intercepts.c:...)
    by 0x........: main (tc20_verifywrap.c:165)
 
 

diff --git a/helgrind/tests/tc23_bogus_condwait.stderr.exp b/helgrind/tests/tc23_bogus_condwait.stderr.exp
index fbe0238f094dce442a57f42153e8e6868aac318a..15f48a5ca417494a46b7bd546cb307907cf70452 100644 (file)
--- a/helgrind/tests/tc23_bogus_condwait.stderr.exp
+++ b/helgrind/tests/tc23_bogus_condwait.stderr.exp
@@ -2,31 +2,38 @@
 Thread #x is the program's root thread
 
 Thread #x: pthread_cond_{timed}wait called with invalid mutex
-   at 0x........: pthread_cond_wait@* (hg_intercepts.c:...)
+   at 0x........: pthread_cond_wait_WRK (hg_intercepts.c:...)
+   by 0x........: pthread_cond_wait@* (hg_intercepts.c:...)
    by 0x........: main (tc23_bogus_condwait.c:69)
 
 Thread #x: pthread_cond_{timed}wait called with un-held mutex
-   at 0x........: pthread_cond_wait@* (hg_intercepts.c:...)
+   at 0x........: pthread_cond_wait_WRK (hg_intercepts.c:...)
+   by 0x........: pthread_cond_wait@* (hg_intercepts.c:...)
    by 0x........: main (tc23_bogus_condwait.c:72)
 
 Thread #x: pthread_cond_{timed}wait: cond is associated with a different mutex
-   at 0x........: pthread_cond_wait@* (hg_intercepts.c:...)
+   at 0x........: pthread_cond_wait_WRK (hg_intercepts.c:...)
+   by 0x........: pthread_cond_wait@* (hg_intercepts.c:...)
    by 0x........: main (tc23_bogus_condwait.c:72)
 
 Thread #x: pthread_cond_{timed}wait called with mutex of type pthread_rwlock_t*
-   at 0x........: pthread_cond_wait@* (hg_intercepts.c:...)
+   at 0x........: pthread_cond_wait_WRK (hg_intercepts.c:...)
+   by 0x........: pthread_cond_wait@* (hg_intercepts.c:...)
    by 0x........: main (tc23_bogus_condwait.c:75)
 
 Thread #x: pthread_cond_{timed}wait: cond is associated with a different mutex
-   at 0x........: pthread_cond_wait@* (hg_intercepts.c:...)
+   at 0x........: pthread_cond_wait_WRK (hg_intercepts.c:...)
+   by 0x........: pthread_cond_wait@* (hg_intercepts.c:...)
    by 0x........: main (tc23_bogus_condwait.c:75)
 
 Thread #x: pthread_cond_{timed}wait called with mutex held by a different thread
-   at 0x........: pthread_cond_wait@* (hg_intercepts.c:...)
+   at 0x........: pthread_cond_wait_WRK (hg_intercepts.c:...)
+   by 0x........: pthread_cond_wait@* (hg_intercepts.c:...)
    by 0x........: main (tc23_bogus_condwait.c:78)
 
 Thread #x: pthread_cond_{timed}wait: cond is associated with a different mutex
-   at 0x........: pthread_cond_wait@* (hg_intercepts.c:...)
+   at 0x........: pthread_cond_wait_WRK (hg_intercepts.c:...)
+   by 0x........: pthread_cond_wait@* (hg_intercepts.c:...)
    by 0x........: main (tc23_bogus_condwait.c:78)