Update expected outputs for glibc25-amd64.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8843 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/helgrind/tests/tc18_semabuse.stderr.exp-glibc25-amd64 b/helgrind/tests/tc18_semabuse.stderr.exp-glibc25-amd64
index f0519c0..c2077ed 100644
--- a/helgrind/tests/tc18_semabuse.stderr.exp-glibc25-amd64
+++ b/helgrind/tests/tc18_semabuse.stderr.exp-glibc25-amd64
@@ -1,12 +1,12 @@
-Thread #1 is the program's root thread
+Thread #x is the program's root thread
-Thread #1's call to sem_init failed
+Thread #x's call to sem_init failed
with error code 22 (EINVAL: Invalid argument)
at 0x........: sem_init@* (hg_intercepts.c:...)
by 0x........: main (tc18_semabuse.c:23)
-Thread #1: Bug in libpthread: sem_wait succeeded on semaphore without prior sem_post
+Thread #x: Bug in libpthread: sem_wait succeeded on semaphore without prior sem_post
at 0x........: sem_wait_WRK (hg_intercepts.c:...)
by 0x........: sem_wait (hg_intercepts.c:...)
by 0x........: main (tc18_semabuse.c:34)
diff --git a/helgrind/tests/tc20_verifywrap.stderr.exp-glibc25-amd64 b/helgrind/tests/tc20_verifywrap.stderr.exp-glibc25-amd64
index 3651269..e0fd6ea 100644
--- a/helgrind/tests/tc20_verifywrap.stderr.exp-glibc25-amd64
+++ b/helgrind/tests/tc20_verifywrap.stderr.exp-glibc25-amd64
@@ -5,26 +5,26 @@
---------------- pthread_create/join ----------------
-Thread #1 is the program's root thread
+Thread #x is the program's root thread
-Thread #2 was created
+Thread #x was created
at 0x........: clone (in /...libc...)
- by 0x........: ...
+ by 0x........: do_clone (in /lib/libpthread...)
by 0x........: pthread_create@GLIBC_ (in /lib/libpthread...)
by 0x........: pthread_create@* (hg_intercepts.c:...)
by 0x........: main (tc20_verifywrap.c:76)
-Possible data race during write of size 2 at 0x........ by thread #1
+Possible data race during write of size 2 at 0x........ by thread #x
at 0x........: main (tc20_verifywrap.c:78)
- This conflicts with a previous access by thread #2
+ This conflicts with a previous write of size 2 by thread #x
at 0x........: racy_child (tc20_verifywrap.c:34)
by 0x........: mythread_wrapper (hg_intercepts.c:...)
- by 0x........: ...
- by 0x........: ...
+ by 0x........: start_thread (in /lib/libpthread...)
+ by 0x........: clone (in /...libc...)
Location 0x........ is 0 bytes inside global var "unprotected"
declared at tc20_verifywrap.c:27
-Thread #1's call to pthread_join failed
+Thread #x's call to pthread_join failed
with error code 35 (EDEADLK: Resource deadlock would occur)
at 0x........: pthread_join (hg_intercepts.c:...)
by 0x........: main (tc20_verifywrap.c:83)
@@ -32,40 +32,40 @@
---------------- pthread_mutex_lock et al ----------------
-Thread #1's call to pthread_mutex_init failed
+Thread #x's call to pthread_mutex_init failed
with error code 95 (EOPNOTSUPP: Operation not supported on transport endpoint)
at 0x........: pthread_mutex_init (hg_intercepts.c:...)
by 0x........: main (tc20_verifywrap.c:92)
-Thread #1: pthread_mutex_destroy of a locked mutex
+Thread #x: pthread_mutex_destroy of a locked mutex
at 0x........: pthread_mutex_destroy (hg_intercepts.c:...)
by 0x........: main (tc20_verifywrap.c:102)
-Thread #1's call to pthread_mutex_destroy failed
+Thread #x's call to pthread_mutex_destroy failed
with error code 16 (EBUSY: Device or resource busy)
at 0x........: pthread_mutex_destroy (hg_intercepts.c:...)
by 0x........: main (tc20_verifywrap.c:102)
-Thread #1's call to pthread_mutex_lock failed
+Thread #x's call to pthread_mutex_lock failed
with error code 22 (EINVAL: Invalid argument)
at 0x........: pthread_mutex_lock (hg_intercepts.c:...)
by 0x........: main (tc20_verifywrap.c:108)
-Thread #1's call to pthread_mutex_trylock failed
+Thread #x's call to pthread_mutex_trylock failed
with error code 22 (EINVAL: Invalid argument)
at 0x........: pthread_mutex_trylock (hg_intercepts.c:...)
by 0x........: main (tc20_verifywrap.c:116)
-Thread #1's call to pthread_mutex_timedlock failed
+Thread #x's call to pthread_mutex_timedlock failed
with error code 22 (EINVAL: Invalid argument)
at 0x........: pthread_mutex_timedlock (hg_intercepts.c:...)
by 0x........: main (tc20_verifywrap.c:121)
-Thread #1 unlocked an invalid lock at 0x........
+Thread #x unlocked an invalid lock at 0x........
at 0x........: pthread_mutex_unlock (hg_intercepts.c:...)
by 0x........: main (tc20_verifywrap.c:125)
-Thread #1's call to pthread_mutex_unlock failed
+Thread #x's call to pthread_mutex_unlock failed
with error code 22 (EINVAL: Invalid argument)
at 0x........: pthread_mutex_unlock (hg_intercepts.c:...)
by 0x........: main (tc20_verifywrap.c:125)
@@ -73,11 +73,11 @@
---------------- pthread_cond_wait et al ----------------
-Thread #1: pthread_cond_{timed}wait called with un-held mutex
+Thread #x: pthread_cond_{timed}wait called with un-held mutex
at 0x........: pthread_cond_wait@* (hg_intercepts.c:...)
by 0x........: main (tc20_verifywrap.c:147)
-Thread #1's call to pthread_cond_wait failed
+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:...)
by 0x........: main (tc20_verifywrap.c:147)
@@ -88,11 +88,11 @@
FIXME: can't figure out how to verify wrap of pthread_broadcast_signal
-Thread #1: pthread_cond_{timed}wait called with un-held mutex
+Thread #x: pthread_cond_{timed}wait called with un-held mutex
at 0x........: pthread_cond_timedwait@* (hg_intercepts.c:...)
by 0x........: main (tc20_verifywrap.c:165)
-Thread #1's call to pthread_cond_timedwait failed
+Thread #x's call to pthread_cond_timedwait failed
with error code 22 (EINVAL: Invalid argument)
at 0x........: pthread_cond_timedwait@* (hg_intercepts.c:...)
by 0x........: main (tc20_verifywrap.c:165)
@@ -100,7 +100,7 @@
---------------- pthread_rwlock_* ----------------
-Thread #1 unlocked a not-locked lock at 0x........
+Thread #x unlocked a not-locked lock at 0x........
at 0x........: pthread_rwlock_unlock (hg_intercepts.c:...)
by 0x........: main (tc20_verifywrap.c:179)
Lock at 0x........ was first observed
@@ -110,7 +110,7 @@
(2) no error on next line
(3) ERROR on next line
-Thread #1 unlocked a not-locked lock at 0x........
+Thread #x unlocked a not-locked lock at 0x........
at 0x........: pthread_rwlock_unlock (hg_intercepts.c:...)
by 0x........: main (tc20_verifywrap.c:196)
Lock at 0x........ was first observed
@@ -122,7 +122,7 @@
(7) no error on next line
(8) ERROR on next line
-Thread #1 unlocked a not-locked lock at 0x........
+Thread #x unlocked a not-locked lock at 0x........
at 0x........: pthread_rwlock_unlock (hg_intercepts.c:...)
by 0x........: main (tc20_verifywrap.c:212)
Lock at 0x........ was first observed
@@ -132,7 +132,7 @@
---------------- sem_* ----------------
-Thread #1's call to sem_init failed
+Thread #x's call to sem_init failed
with error code 22 (EINVAL: Invalid argument)
at 0x........: sem_init@* (hg_intercepts.c:...)
by 0x........: main (tc20_verifywrap.c:228)
@@ -140,7 +140,7 @@
FIXME: can't figure out how to verify wrap of sem_destroy
-Thread #1: Bug in libpthread: sem_wait succeeded on semaphore without prior sem_post
+Thread #x: Bug in libpthread: sem_wait succeeded on semaphore without prior sem_post
at 0x........: sem_wait_WRK (hg_intercepts.c:...)
by 0x........: sem_wait (hg_intercepts.c:...)
by 0x........: main (tc20_verifywrap.c:242)
@@ -151,9 +151,9 @@
------------ dealloc of mem holding locks ------------
-Thread #1: Exiting thread still holds 1 lock
+Thread #x: Exiting thread still holds 1 lock
at 0x........: _Exit (in /...libc...)
- by 0x........: ...
+ by 0x........: exit (in /...libc...)
by 0x........: (below main) (in /...libc...)
ERROR SUMMARY: 20 errors from 20 contexts (suppressed: 0 from 0)
