Updated expected output.

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

diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc
index f36c14a5adb53e3307c384917f869171f31f259a..557fdf5a8f451de3287e35e9f16c531fc1ffdf52 100644 (file)
--- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc
+++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc
@@ -163,60 +163,60 @@ FIXME: can't figure out how to verify wrap of sem_post
 
 ------------ dealloc of mem holding locks ------------
 
-[1/1] mutex_destroy   invalid mutex 0x........
-[1/1] mutex_destroy   error checking mutex 0x........
+[1/1] mutex_destroy   invalid mutex 0x........ rc 0 owner 0
+[1/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)
 
 Destroying locked rwlock: rwlock 0x.........
    at 0x........: main (tc20_verifywrap.c:262)
-[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_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