From: Bart Van Assche Date: Sat, 1 Mar 2008 15:34:25 +0000 (+0000) Subject: Updated alternative expected output files. X-Git-Tag: svn/VALGRIND_3_4_0~988 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2649370c7392789b29a1d98bb851e71b2562510a;p=thirdparty%2Fvalgrind.git Updated alternative expected output files. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7525 --- diff --git a/exp-drd/tests/tc20_verifywrap.stderr.exp b/exp-drd/tests/tc20_verifywrap.stderr.exp index 9dc092088c..731008b1bb 100644 --- a/exp-drd/tests/tc20_verifywrap.stderr.exp +++ b/exp-drd/tests/tc20_verifywrap.stderr.exp @@ -16,6 +16,10 @@ Other segment end (thread 2) ---------------- pthread_mutex_lock et al ---------------- +Invalid mutex + at 0x........: pthread_mutex_init (drd_intercepts.c:?) + by 0x........: main (tc20_verifywrap.c:92) + Destroying locked mutex: address 0x........, recursion count 1, owner 1. at 0x........: pthread_mutex_destroy (drd_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:102) @@ -36,10 +40,6 @@ Invalid mutex at 0x........: pthread_mutex_unlock (drd_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:125) -Mutex not locked: address 0x........, recursion count 0, owner 0. - at 0x........: pthread_mutex_unlock (drd_intercepts.c:?) - by 0x........: main (tc20_verifywrap.c:125) - ---------------- pthread_cond_wait et al ---------------- diff --git a/exp-drd/tests/tc20_verifywrap2.stderr.exp b/exp-drd/tests/tc20_verifywrap2.stderr.exp index dbdfc0fc3a..28534ed041 100644 --- a/exp-drd/tests/tc20_verifywrap2.stderr.exp +++ b/exp-drd/tests/tc20_verifywrap2.stderr.exp @@ -16,39 +16,41 @@ Other segment end (thread 2) ---------------- pthread_mutex_lock et al ---------------- [1/1] mutex_init invalid mutex 0x........ + +Invalid mutex + at 0x........: pthread_mutex_init (drd_intercepts.c:?) + by 0x........: main (tc20_verifywrap.c:92) [1/1] mutex_init mutex 0x........ +[1/1] pre_mutex_lock mutex 0x........ rc 0 owner 0 [1/1] post_mutex_lock mutex 0x........ rc 0 owner 0 [1/1] mutex_destroy mutex 0x........ Destroying locked mutex: address 0x........, recursion count 1, owner 1. at 0x........: pthread_mutex_destroy (drd_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:102) -[1/1] mutex_init invalid mutex 0x........ -[1/1] post_mutex_lock invalid mutex 0x........ rc 0 owner 0 +[1/1] pre_mutex_lock (?) 0x........ rc 0 owner 0 Invalid mutex at 0x........: pthread_mutex_lock (drd_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:108) -[1/1] post_mutex_lock invalid mutex 0x........ rc 0 owner 0 +[1/1] post_mutex_lock (?) 0x........ rc 0 owner 0 +[1/1] pre_mutex_lock (?) 0x........ rc 0 owner 0 Invalid mutex at 0x........: pthread_mutex_trylock (drd_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:116) -[1/1] post_mutex_lock invalid mutex 0x........ rc 0 owner 0 +[1/1] post_mutex_lock (?) 0x........ rc 0 owner 0 +[1/1] pre_mutex_lock (?) 0x........ rc 0 owner 0 Invalid mutex at 0x........: pthread_mutex_timedlock (drd_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:121) -[1/1] mutex_unlock invalid mutex 0x........ rc 0 +[1/1] post_mutex_lock (?) 0x........ rc 0 owner 0 Invalid mutex at 0x........: pthread_mutex_unlock (drd_intercepts.c:?) by 0x........: main (tc20_verifywrap.c:125) -Mutex not locked: address 0x........, recursion count 0, owner 0. - at 0x........: pthread_mutex_unlock (drd_intercepts.c:?) - by 0x........: main (tc20_verifywrap.c:125) - ---------------- pthread_cond_wait et al ---------------- [1/1] mutex_init error checking mutex 0x........ @@ -110,39 +112,53 @@ FIXME: can't figure out how to verify wrap of sem_post ------------ dealloc of mem holding locks ------------ [1/1] mutex_destroy error checking mutex 0x........ -[1/1] mutex_destroy invalid mutex 0x........ -[1/1] mutex_destroy invalid mutex 0x........ +[1/1] pre_mutex_lock (?) 0x........ rc 0 owner 0 [1/1] mutex_init recursive mutex 0x........ [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] 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] 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] 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] 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] 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] 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] 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] 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] 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] 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] 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] 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] 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] 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] post_mutex_lock recursive mutex 0x........ rc 0 owner 1 [1/1] mutex_unlock recursive mutex 0x........ rc 1