|
From: <sv...@va...> - 2008-03-01 15:34:20
|
Author: bart
Date: 2008-03-01 15:34:25 +0000 (Sat, 01 Mar 2008)
New Revision: 7525
Log:
Updated alternative expected output files.
Modified:
trunk/exp-drd/tests/tc20_verifywrap.stderr.exp
trunk/exp-drd/tests/tc20_verifywrap2.stderr.exp
Modified: trunk/exp-drd/tests/tc20_verifywrap.stderr.exp
===================================================================
--- trunk/exp-drd/tests/tc20_verifywrap.stderr.exp 2008-03-01 15:27:41 UTC (rev 7524)
+++ trunk/exp-drd/tests/tc20_verifywrap.stderr.exp 2008-03-01 15:34:25 UTC (rev 7525)
@@ -16,6 +16,10 @@
---------------- 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 @@
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 ----------------
Modified: trunk/exp-drd/tests/tc20_verifywrap2.stderr.exp
===================================================================
--- trunk/exp-drd/tests/tc20_verifywrap2.stderr.exp 2008-03-01 15:27:41 UTC (rev 7524)
+++ trunk/exp-drd/tests/tc20_verifywrap2.stderr.exp 2008-03-01 15:34:25 UTC (rev 7525)
@@ -16,39 +16,41 @@
---------------- 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 @@
------------ 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
|