From: Bart Van Assche <bvanassche@acm.org>
Date: Sat, 25 Apr 2009 08:26:24 +0000 (+0000)
Subject: glibc 2.8 expected output updates.
X-Git-Tag: svn/VALGRIND_3_5_0~778
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72afcffe66612d15974050e0a3ad3e7753b12f49;p=thirdparty%2Fvalgrind.git

glibc 2.8 expected output updates.

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

diff --git a/drd/tests/tc09_bad_unlock.stderr.exp-glibc2.8 b/drd/tests/tc09_bad_unlock.stderr.exp-glibc2.8
index 293a6cf663..93e58a5dfe 100644
--- a/drd/tests/tc09_bad_unlock.stderr.exp-glibc2.8
+++ b/drd/tests/tc09_bad_unlock.stderr.exp-glibc2.8
@@ -29,6 +29,10 @@ The object at address 0x........ is not a mutex.
 Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
    at 0x........: nearly_main (tc09_bad_unlock.c:45)
    by 0x........: (below main)
+mutex 0x........ was first observed at:
+   at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
+   by 0x........: nearly_main (tc09_bad_unlock.c:31)
+   by 0x........: main (tc09_bad_unlock.c:49)
 ---------------------
 
 Mutex not locked by calling thread: mutex 0x........, recursion count 0, owner 1.
@@ -61,5 +65,9 @@ The object at address 0x........ is not a mutex.
 Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
    at 0x........: nearly_main (tc09_bad_unlock.c:45)
    by 0x........: (below main)
+mutex 0x........ was first observed at:
+   at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
+   by 0x........: nearly_main (tc09_bad_unlock.c:31)
+   by 0x........: main (tc09_bad_unlock.c:50)
 
 ERROR SUMMARY: 8 errors from 8 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 c11a112379..2b684f8a00 100644
--- a/drd/tests/tc20_verifywrap.stderr.exp-glibc2.8
+++ b/drd/tests/tc20_verifywrap.stderr.exp-glibc2.8
@@ -86,19 +86,29 @@ rwlock 0x........ was first observed at:
 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)
+rwlock 0x........ was first observed at:
+   at 0x........: pthread_rwlock_init* (drd_pthread_intercepts.c:?)
+   by 0x........: main (tc20_verifywrap.c:186)
 
 ---------------- sem_* ----------------
 
 
+Semaphore reinitialization: semaphore 0x........
+   at 0x........: sem_init* (drd_pthread_intercepts.c:?)
+   by 0x........: main (tc20_verifywrap.c:231)
+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
 
 
 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)
-   at 0x........: sem_wait* (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:242)
 
 FIXME: can't figure out how to verify wrap of sem_post
 
@@ -106,10 +116,4 @@ FIXME: can't figure out how to verify wrap of sem_post
 ------------ dealloc of mem holding locks ------------
 
 
-Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: (within ld-?.?.so)
-   by 0x........: exit (in /...libc...)
-   by 0x........: (below main)
-
-ERROR SUMMARY: 14 errors from 14 contexts (suppressed: 0 from 0)
+ERROR SUMMARY: 11 errors from 11 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 72524cf419..2a8f7c778c 100644
--- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
+++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
@@ -119,6 +119,13 @@ rwlock 0x........ was first observed at:
 [1/1] semaphore_init      0x........ value 4294967295
 [1/1] semaphore_init      0x........ value 0
 
+Semaphore reinitialization: semaphore 0x........
+   at 0x........: sem_init* (drd_pthread_intercepts.c:?)
+   by 0x........: main (tc20_verifywrap.c:231)
+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/1] semaphore_wait      0x........ value 0 -> 4294967295
@@ -137,61 +144,55 @@ FIXME: can't figure out how to verify wrap of sem_post
 
 ------------ dealloc of mem holding locks ------------
 
-[1/1] pre_mutex_lock  recursive 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_destroy   error checking mutex 0x........
-
-Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: (within ld-?.?.so)
-   by 0x........: exit (in /...libc...)
-   by 0x........: (below main)
-[1/1] mutex_destroy   invalid mutex 0x........
+[1/1] mutex_destroy   error checking mutex 0x........ rc 1 owner 1
+[1/1] mutex_destroy   mutex 0x........ rc 0 owner 0
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1
-[1/1] pre_mutex_lock  recursive mutex 0x........ rc 0 owner 1
+[1/1] mutex_trylock   recursive mutex 0x........ rc 0 owner 1
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 1
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1
-[1/1] pre_mutex_lock  recursive mutex 0x........ rc 0 owner 1
+[1/1] mutex_trylock   recursive mutex 0x........ rc 0 owner 1
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 1
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1
-[1/1] pre_mutex_lock  recursive mutex 0x........ rc 0 owner 1
+[1/1] mutex_trylock   recursive mutex 0x........ rc 0 owner 1
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 1
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1
-[1/1] pre_mutex_lock  recursive mutex 0x........ rc 0 owner 1
+[1/1] mutex_trylock   recursive mutex 0x........ rc 0 owner 1
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 1
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1
-[1/1] pre_mutex_lock  recursive mutex 0x........ rc 0 owner 1
+[1/1] mutex_trylock   recursive mutex 0x........ rc 0 owner 1
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 1
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1
-[1/1] pre_mutex_lock  recursive mutex 0x........ rc 0 owner 1
+[1/1] mutex_trylock   recursive mutex 0x........ rc 0 owner 1
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 1
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1
-[1/1] pre_mutex_lock  recursive mutex 0x........ rc 0 owner 1
+[1/1] mutex_trylock   recursive mutex 0x........ rc 0 owner 1
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 1
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1
-[1/1] pre_mutex_lock  recursive mutex 0x........ rc 0 owner 1
+[1/1] mutex_trylock   recursive mutex 0x........ rc 0 owner 1
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 1
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1
-[1/1] pre_mutex_lock  recursive mutex 0x........ rc 0 owner 1
+[1/1] mutex_trylock   recursive mutex 0x........ rc 0 owner 1
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 1
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1
-[1/1] pre_mutex_lock  recursive mutex 0x........ rc 0 owner 1
+[1/1] mutex_trylock   recursive mutex 0x........ rc 0 owner 1
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 1
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1
-[1/1] pre_mutex_lock  recursive mutex 0x........ rc 0 owner 1
+[1/1] mutex_trylock   recursive mutex 0x........ rc 0 owner 1
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 1
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1
-[1/1] pre_mutex_lock  recursive mutex 0x........ rc 0 owner 1
+[1/1] mutex_trylock   recursive mutex 0x........ rc 0 owner 1
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 1
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1
-[1/1] pre_mutex_lock  recursive mutex 0x........ rc 0 owner 1
+[1/1] mutex_trylock   recursive mutex 0x........ rc 0 owner 1
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 1
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1
-[1/1] pre_mutex_lock  recursive mutex 0x........ rc 0 owner 1
+[1/1] mutex_trylock   recursive mutex 0x........ rc 0 owner 1
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 1
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1
-[1/1] pre_mutex_lock  recursive mutex 0x........ rc 0 owner 1
+[1/1] mutex_trylock   recursive mutex 0x........ rc 0 owner 1
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 1
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1
 
-ERROR SUMMARY: 14 errors from 14 contexts (suppressed: 0 from 0)
+ERROR SUMMARY: 11 errors from 11 contexts (suppressed: 0 from 0)