|
From: <sv...@va...> - 2009-04-18 15:41:06
|
Author: bart
Date: 2009-04-18 16:40:54 +0100 (Sat, 18 Apr 2009)
New Revision: 9575
Log:
glibc-2.3 expected output updates.
Modified:
trunk/drd/tests/tc20_verifywrap.stderr.exp-glibc2.3
trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
Modified: trunk/drd/tests/tc20_verifywrap.stderr.exp-glibc2.3
===================================================================
--- trunk/drd/tests/tc20_verifywrap.stderr.exp-glibc2.3 2009-04-18 15:25:37 UTC (rev 9574)
+++ trunk/drd/tests/tc20_verifywrap.stderr.exp-glibc2.3 2009-04-18 15:40:54 UTC (rev 9575)
@@ -31,21 +31,7 @@
make pthread_mutex_lock fail: skipped on glibc < 2.4
-The object at address 0x........ is not a mutex.
- at 0x........: pthread_mutex_trylock (drd_pthread_intercepts.c:?)
- by 0x........: main (tc20_verifywrap.c:116)
-mutex 0x........ was first observed at:
- at 0x........: pthread_mutex_trylock (drd_pthread_intercepts.c:?)
- by 0x........: main (tc20_verifywrap.c:116)
-
-The object at address 0x........ is not a mutex.
- at 0x........: pthread_mutex_timedlock (drd_pthread_intercepts.c:?)
- by 0x........: main (tc20_verifywrap.c:121)
-mutex 0x........ was first observed at:
- at 0x........: pthread_mutex_trylock (drd_pthread_intercepts.c:?)
- by 0x........: main (tc20_verifywrap.c:116)
-
-The object at address 0x........ is not a mutex.
+Mutex not locked: mutex 0x........, recursion count 0, owner 0.
at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
by 0x........: main (tc20_verifywrap.c:125)
mutex 0x........ was first observed at:
@@ -145,4 +131,4 @@
at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
by 0x........: main (tc20_verifywrap.c:145)
-ERROR SUMMARY: 15 errors from 15 contexts (suppressed: 0 from 0)
+ERROR SUMMARY: 13 errors from 13 contexts (suppressed: 0 from 0)
Modified: trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
===================================================================
--- trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3 2009-04-18 15:25:37 UTC (rev 9574)
+++ trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3 2009-04-18 15:40:54 UTC (rev 9575)
@@ -29,30 +29,19 @@
Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
at 0x........: pthread_mutex_destroy (drd_pthread_intercepts.c:?)
by 0x........: main (tc20_verifywrap.c:102)
+mutex 0x........ was first observed at:
+ at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
+ by 0x........: main (tc20_verifywrap.c:100)
make pthread_mutex_lock fail: skipped on glibc < 2.4
-[1/1] pre_mutex_lock invalid mutex 0x........ rc 0 owner 0
+[1/1] pre_mutex_lock mutex 0x........ rc 0 owner 0
+[1/1] post_mutex_lock mutex 0x........ rc 0 owner 0 (locking failed)
+[1/1] mutex_trylock mutex 0x........ rc 0 owner 0
+[1/1] post_mutex_lock mutex 0x........ rc 0 owner 0 (locking failed)
+[1/1] mutex_unlock mutex 0x........ rc 0
-The object at address 0x........ is not a mutex.
- at 0x........: pthread_mutex_trylock (drd_pthread_intercepts.c:?)
- by 0x........: main (tc20_verifywrap.c:116)
-mutex 0x........ was first observed at:
- at 0x........: pthread_mutex_trylock (drd_pthread_intercepts.c:?)
- by 0x........: main (tc20_verifywrap.c:116)
-[1/1] post_mutex_lock invalid mutex 0x........ rc 0 owner 0 (locking failed)
-[1/1] mutex_trylock invalid mutex 0x........ rc 0 owner 0
-
-The object at address 0x........ is not a mutex.
- at 0x........: pthread_mutex_timedlock (drd_pthread_intercepts.c:?)
- by 0x........: main (tc20_verifywrap.c:121)
-mutex 0x........ was first observed at:
- at 0x........: pthread_mutex_trylock (drd_pthread_intercepts.c:?)
- by 0x........: main (tc20_verifywrap.c:116)
-[1/1] post_mutex_lock invalid mutex 0x........ rc 0 owner 0 (locking failed)
-[1/1] mutex_unlock invalid mutex 0x........ rc 0
-
-The object at address 0x........ is not a mutex.
+Mutex not locked: mutex 0x........, recursion count 0, owner 0.
at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
by 0x........: main (tc20_verifywrap.c:125)
mutex 0x........ was first observed at:
@@ -219,4 +208,4 @@
[1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 1
[1/1] mutex_unlock recursive mutex 0x........ rc 1
-ERROR SUMMARY: 15 errors from 15 contexts (suppressed: 0 from 0)
+ERROR SUMMARY: 13 errors from 13 contexts (suppressed: 0 from 0)
|