|
From: <sv...@va...> - 2009-07-23 18:11:08
|
Author: bart
Date: 2009-07-23 19:10:55 +0100 (Thu, 23 Jul 2009)
New Revision: 10567
Log:
Modified filter_stderr to filter out even more platform differences.
Modified:
trunk/drd/tests/filter_stderr
trunk/drd/tests/pth_cond_race.stderr.exp
trunk/drd/tests/pth_inconsistent_cond_wait.stderr.exp1
trunk/drd/tests/pth_inconsistent_cond_wait.stderr.exp2
trunk/drd/tests/tc20_verifywrap.stderr.exp-glibc2.3
trunk/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5
trunk/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5-ppc
trunk/drd/tests/tc20_verifywrap.stderr.exp-glibc2.8
trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5
trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc
trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
trunk/drd/tests/tc23_bogus_condwait.stderr.exp-darwin
trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux-ppc
trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux-x86
Modified: trunk/drd/tests/filter_stderr
===================================================================
--- trunk/drd/tests/filter_stderr 2009-07-23 18:02:52 UTC (rev 10566)
+++ trunk/drd/tests/filter_stderr 2009-07-23 18:10:55 UTC (rev 10567)
@@ -25,6 +25,8 @@
-e "s/was held during [0-9][0-9]*/was held during .../" \
-e "s: BSS section of .*/: BSS section of :g" \
-e "s: vc \[[ ,:0-9]*\]: vc ...:g" \
+-e "s/: pthread_cond_wait\* /: pthread_cond_wait /" \
+-e "s/: pthread_cond_signal@\* /: pthread_cond_signal /" \
-e "s/ (\([a-zA-Z_]*\.c\):[0-9]*)/ (\1:?)/" \
-e "s/ (\([a-zA-Z_]*\.h\):[0-9]*)/ (\1:?)/" \
-e "s/ (\([a-zA-Z_]*\.cpp\):[0-9]*)/ (\1:?)/" |
Modified: trunk/drd/tests/pth_cond_race.stderr.exp
===================================================================
--- trunk/drd/tests/pth_cond_race.stderr.exp 2009-07-23 18:02:52 UTC (rev 10566)
+++ trunk/drd/tests/pth_cond_race.stderr.exp 2009-07-23 18:10:55 UTC (rev 10567)
@@ -1,7 +1,7 @@
Thread 2:
Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
- at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_signal (drd_pthread_intercepts.c:?)
by 0x........: thread_func (pth_cond_race.c:?)
by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
cond 0x........ was first observed at:
Modified: trunk/drd/tests/pth_inconsistent_cond_wait.stderr.exp1
===================================================================
--- trunk/drd/tests/pth_inconsistent_cond_wait.stderr.exp1 2009-07-23 18:02:52 UTC (rev 10566)
+++ trunk/drd/tests/pth_inconsistent_cond_wait.stderr.exp1 2009-07-23 18:10:55 UTC (rev 10567)
@@ -16,7 +16,7 @@
Thread 1:
Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
- at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_signal (drd_pthread_intercepts.c:?)
by 0x........: main (pth_inconsistent_cond_wait.c:?)
cond 0x........ was first observed at:
at 0x........: pthread_cond_init* (drd_pthread_intercepts.c:?)
@@ -26,7 +26,7 @@
by 0x........: main (pth_inconsistent_cond_wait.c:?)
Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
- at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_signal (drd_pthread_intercepts.c:?)
by 0x........: main (pth_inconsistent_cond_wait.c:?)
cond 0x........ was first observed at:
at 0x........: pthread_cond_init* (drd_pthread_intercepts.c:?)
Modified: trunk/drd/tests/pth_inconsistent_cond_wait.stderr.exp2
===================================================================
--- trunk/drd/tests/pth_inconsistent_cond_wait.stderr.exp2 2009-07-23 18:02:52 UTC (rev 10566)
+++ trunk/drd/tests/pth_inconsistent_cond_wait.stderr.exp2 2009-07-23 18:10:55 UTC (rev 10567)
@@ -16,7 +16,7 @@
Thread 1:
Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
- at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_signal (drd_pthread_intercepts.c:?)
by 0x........: main (pth_inconsistent_cond_wait.c:?)
cond 0x........ was first observed at:
at 0x........: pthread_cond_init* (drd_pthread_intercepts.c:?)
@@ -26,7 +26,7 @@
by 0x........: main (pth_inconsistent_cond_wait.c:?)
Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
- at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_signal (drd_pthread_intercepts.c:?)
by 0x........: main (pth_inconsistent_cond_wait.c:?)
cond 0x........ was first observed at:
at 0x........: pthread_cond_init* (drd_pthread_intercepts.c:?)
Modified: trunk/drd/tests/tc20_verifywrap.stderr.exp-glibc2.3
===================================================================
--- trunk/drd/tests/tc20_verifywrap.stderr.exp-glibc2.3 2009-07-23 18:02:52 UTC (rev 10566)
+++ trunk/drd/tests/tc20_verifywrap.stderr.exp-glibc2.3 2009-07-23 18:10:55 UTC (rev 10567)
@@ -42,7 +42,7 @@
Mutex not locked: mutex 0x........, recursion count 0, owner 0.
- at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
by 0x........: main (tc20_verifywrap.c:147)
mutex 0x........ was first observed at:
at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
Modified: trunk/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5
===================================================================
--- trunk/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5 2009-07-23 18:02:52 UTC (rev 10566)
+++ trunk/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5 2009-07-23 18:10:55 UTC (rev 10567)
@@ -39,7 +39,7 @@
Mutex not locked: mutex 0x........, recursion count 0, owner 0.
- at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
by 0x........: main (tc20_verifywrap.c:147)
mutex 0x........ was first observed at:
at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
Modified: trunk/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5-ppc
===================================================================
--- trunk/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5-ppc 2009-07-23 18:02:52 UTC (rev 10566)
+++ trunk/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5-ppc 2009-07-23 18:10:55 UTC (rev 10567)
@@ -39,7 +39,7 @@
Mutex not locked: mutex 0x........, recursion count 0, owner 0.
- at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
by 0x........: main (tc20_verifywrap.c:147)
mutex 0x........ was first observed at:
at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
Modified: trunk/drd/tests/tc20_verifywrap.stderr.exp-glibc2.8
===================================================================
--- trunk/drd/tests/tc20_verifywrap.stderr.exp-glibc2.8 2009-07-23 18:02:52 UTC (rev 10566)
+++ trunk/drd/tests/tc20_verifywrap.stderr.exp-glibc2.8 2009-07-23 18:10:55 UTC (rev 10567)
@@ -39,7 +39,7 @@
Mutex not locked: mutex 0x........, recursion count 0, owner 0.
- at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
by 0x........: main (tc20_verifywrap.c:147)
mutex 0x........ was first observed at:
at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
Modified: trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
===================================================================
--- trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3 2009-07-23 18:02:52 UTC (rev 10566)
+++ trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3 2009-07-23 18:10:55 UTC (rev 10567)
@@ -55,7 +55,7 @@
[1] mutex_unlock error checking mutex 0x........ rc 0
Mutex not locked: mutex 0x........, recursion count 0, owner 0.
- at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
by 0x........: main (tc20_verifywrap.c:147)
mutex 0x........ was first observed at:
at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
Modified: trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
===================================================================
--- trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b 2009-07-23 18:02:52 UTC (rev 10566)
+++ trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b 2009-07-23 18:10:55 UTC (rev 10567)
@@ -66,7 +66,7 @@
[1] mutex_unlock error checking mutex 0x........ rc 0
Mutex not locked: mutex 0x........, recursion count 0, owner 0.
- at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
by 0x........: main (tc20_verifywrap.c:147)
mutex 0x........ was first observed at:
at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
Modified: trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5
===================================================================
--- trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5 2009-07-23 18:02:52 UTC (rev 10566)
+++ trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5 2009-07-23 18:10:55 UTC (rev 10567)
@@ -54,7 +54,7 @@
[1] mutex_unlock error checking mutex 0x........ rc 0
Mutex not locked: mutex 0x........, recursion count 0, owner 0.
- at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
by 0x........: main (tc20_verifywrap.c:147)
mutex 0x........ was first observed at:
at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
Modified: trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc
===================================================================
--- trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc 2009-07-23 18:02:52 UTC (rev 10566)
+++ trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc 2009-07-23 18:10:55 UTC (rev 10567)
@@ -54,7 +54,7 @@
[1] mutex_unlock error checking mutex 0x........ rc 0
Mutex not locked: mutex 0x........, recursion count 0, owner 0.
- at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
by 0x........: main (tc20_verifywrap.c:147)
mutex 0x........ was first observed at:
at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
Modified: trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
===================================================================
--- trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8 2009-07-23 18:02:52 UTC (rev 10566)
+++ trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8 2009-07-23 18:10:55 UTC (rev 10567)
@@ -54,7 +54,7 @@
[1] mutex_unlock error checking mutex 0x........ rc 0
Mutex not locked: mutex 0x........, recursion count 0, owner 0.
- at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
by 0x........: main (tc20_verifywrap.c:147)
mutex 0x........ was first observed at:
at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
Modified: trunk/drd/tests/tc23_bogus_condwait.stderr.exp-darwin
===================================================================
--- trunk/drd/tests/tc23_bogus_condwait.stderr.exp-darwin 2009-07-23 18:02:52 UTC (rev 10566)
+++ trunk/drd/tests/tc23_bogus_condwait.stderr.exp-darwin 2009-07-23 18:10:55 UTC (rev 10567)
@@ -10,15 +10,15 @@
Thread 1:
The object at address 0x........ is not a mutex.
- at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
by 0x........: main (tc23_bogus_condwait.c:75)
The object at address 0x........ is not a mutex.
- at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
by 0x........: main (tc23_bogus_condwait.c:75)
Mutex not locked: mutex 0x........, recursion count 0, owner 0.
- at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
by 0x........: main (tc23_bogus_condwait.c:78)
mutex 0x........ was first observed at:
at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
@@ -38,21 +38,21 @@
Thread 1:
The object at address 0x........ is not a mutex.
- at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
by 0x........: main (tc23_bogus_condwait.c:81)
rwlock 0x........ was first observed at:
at 0x........: pthread_rwlock_init* (drd_pthread_intercepts.c:?)
by 0x........: main (tc23_bogus_condwait.c:63)
The object at address 0x........ is not a mutex.
- at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
by 0x........: main (tc23_bogus_condwait.c:81)
rwlock 0x........ was first observed at:
at 0x........: pthread_rwlock_init* (drd_pthread_intercepts.c:?)
by 0x........: main (tc23_bogus_condwait.c:63)
Mutex not locked by calling thread: mutex 0x........, recursion count 0, owner 2.
- at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
by 0x........: main (tc23_bogus_condwait.c:84)
mutex 0x........ was first observed at:
at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
Modified: trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux-ppc
===================================================================
--- trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux-ppc 2009-07-23 18:02:52 UTC (rev 10566)
+++ trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux-ppc 2009-07-23 18:10:55 UTC (rev 10567)
@@ -1,10 +1,10 @@
The object at address 0x........ is not a mutex.
- at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
by 0x........: main (tc23_bogus_condwait.c:69)
The object at address 0x........ is not a mutex.
- at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
by 0x........: main (tc23_bogus_condwait.c:69)
Process terminating with default action of signal 7 (SIGBUS)
Modified: trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux-x86
===================================================================
--- trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux-x86 2009-07-23 18:02:52 UTC (rev 10566)
+++ trunk/drd/tests/tc23_bogus_condwait.stderr.exp-linux-x86 2009-07-23 18:10:55 UTC (rev 10567)
@@ -1,15 +1,15 @@
The object at address 0x........ is not a mutex.
- at 0x........: pthread_cond_wait@* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
by 0x........: main (tc23_bogus_condwait.c:69)
The object at address 0x........ is not a mutex.
- at 0x........: pthread_cond_wait@* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
by 0x........: main (tc23_bogus_condwait.c:69)
Thread 3:
Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
- at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_signal (drd_pthread_intercepts.c:?)
by 0x........: rescue_me (tc23_bogus_condwait.c:20)
by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
cond 0x........ was first observed at:
@@ -18,7 +18,7 @@
Thread 1:
Mutex not locked: mutex 0x........, recursion count 0, owner 0.
- at 0x........: pthread_cond_wait@* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
by 0x........: main (tc23_bogus_condwait.c:72)
mutex 0x........ was first observed at:
at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
@@ -26,7 +26,7 @@
Thread 3:
Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
- at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_signal (drd_pthread_intercepts.c:?)
by 0x........: rescue_me (tc23_bogus_condwait.c:24)
by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
cond 0x........ was first observed at:
@@ -38,14 +38,14 @@
Thread 1:
The object at address 0x........ is not a mutex.
- at 0x........: pthread_cond_wait@* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
by 0x........: main (tc23_bogus_condwait.c:75)
rwlock 0x........ was first observed at:
at 0x........: pthread_rwlock_init* (drd_pthread_intercepts.c:?)
by 0x........: main (tc23_bogus_condwait.c:57)
The object at address 0x........ is not a mutex.
- at 0x........: pthread_cond_wait@* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
by 0x........: main (tc23_bogus_condwait.c:75)
rwlock 0x........ was first observed at:
at 0x........: pthread_rwlock_init* (drd_pthread_intercepts.c:?)
@@ -53,7 +53,7 @@
Thread 3:
Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
- at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_signal (drd_pthread_intercepts.c:?)
by 0x........: rescue_me (tc23_bogus_condwait.c:28)
by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
cond 0x........ was first observed at:
@@ -65,7 +65,7 @@
Thread 1:
Mutex not locked by calling thread: mutex 0x........, recursion count 1, owner 2.
- at 0x........: pthread_cond_wait@* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
by 0x........: main (tc23_bogus_condwait.c:78)
mutex 0x........ was first observed at:
at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
@@ -73,7 +73,7 @@
Thread 3:
Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
- at 0x........: pthread_cond_signal@* (drd_pthread_intercepts.c:?)
+ at 0x........: pthread_cond_signal (drd_pthread_intercepts.c:?)
by 0x........: rescue_me (tc23_bogus_condwait.c:32)
by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
cond 0x........ was first observed at:
|