From 498f9a41ffededd32cd2a525e21de22c923e2088 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Thu, 23 Jul 2009 18:10:55 +0000
Subject: [PATCH] Modified filter_stderr to filter out even more platform
 differences.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10567
---
 drd/tests/filter_stderr                       |  2 ++
 drd/tests/pth_cond_race.stderr.exp            |  2 +-
 .../pth_inconsistent_cond_wait.stderr.exp1    |  4 ++--
 .../pth_inconsistent_cond_wait.stderr.exp2    |  4 ++--
 drd/tests/tc20_verifywrap.stderr.exp-glibc2.3 |  2 +-
 drd/tests/tc20_verifywrap.stderr.exp-glibc2.5 |  2 +-
 .../tc20_verifywrap.stderr.exp-glibc2.5-ppc   |  2 +-
 drd/tests/tc20_verifywrap.stderr.exp-glibc2.8 |  2 +-
 .../tc20_verifywrap2.stderr.exp-glibc2.3      |  2 +-
 .../tc20_verifywrap2.stderr.exp-glibc2.3-b    |  2 +-
 .../tc20_verifywrap2.stderr.exp-glibc2.5      |  2 +-
 .../tc20_verifywrap2.stderr.exp-glibc2.5-ppc  |  2 +-
 .../tc20_verifywrap2.stderr.exp-glibc2.8      |  2 +-
 .../tc23_bogus_condwait.stderr.exp-darwin     | 12 +++++------
 .../tc23_bogus_condwait.stderr.exp-linux-ppc  |  4 ++--
 .../tc23_bogus_condwait.stderr.exp-linux-x86  | 20 +++++++++----------
 16 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/drd/tests/filter_stderr b/drd/tests/filter_stderr
index 09652c9cff..e726994d99 100755
--- a/drd/tests/filter_stderr
+++ b/drd/tests/filter_stderr
@@ -25,6 +25,8 @@ sed \
 -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:?)/" |
diff --git a/drd/tests/pth_cond_race.stderr.exp b/drd/tests/pth_cond_race.stderr.exp
index f07dddaef7..5a2f60d58f 100644
--- a/drd/tests/pth_cond_race.stderr.exp
+++ b/drd/tests/pth_cond_race.stderr.exp
@@ -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:
diff --git a/drd/tests/pth_inconsistent_cond_wait.stderr.exp1 b/drd/tests/pth_inconsistent_cond_wait.stderr.exp1
index 595dc3ea1c..810788851a 100644
--- a/drd/tests/pth_inconsistent_cond_wait.stderr.exp1
+++ b/drd/tests/pth_inconsistent_cond_wait.stderr.exp1
@@ -16,7 +16,7 @@ mutex 0x........ was first observed at:
 
 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 @@ mutex 0x........ was first observed at:
    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:?)
diff --git a/drd/tests/pth_inconsistent_cond_wait.stderr.exp2 b/drd/tests/pth_inconsistent_cond_wait.stderr.exp2
index 7391bdc48a..c2788560b3 100644
--- a/drd/tests/pth_inconsistent_cond_wait.stderr.exp2
+++ b/drd/tests/pth_inconsistent_cond_wait.stderr.exp2
@@ -16,7 +16,7 @@ mutex 0x........ was first observed at:
 
 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 @@ mutex 0x........ was first observed at:
    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:?)
diff --git a/drd/tests/tc20_verifywrap.stderr.exp-glibc2.3 b/drd/tests/tc20_verifywrap.stderr.exp-glibc2.3
index 9b10b5ded3..8e2e8862b2 100644
--- a/drd/tests/tc20_verifywrap.stderr.exp-glibc2.3
+++ b/drd/tests/tc20_verifywrap.stderr.exp-glibc2.3
@@ -42,7 +42,7 @@ mutex 0x........ was first observed at:
 
 
 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:?)
diff --git a/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5 b/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5
index d120ca6ab7..7dcf618830 100644
--- a/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5
+++ b/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5
@@ -39,7 +39,7 @@ mutex 0x........ was first observed at:
 
 
 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:?)
diff --git a/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5-ppc b/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5-ppc
index bf98809426..7236a3e826 100644
--- a/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5-ppc
+++ b/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5-ppc
@@ -39,7 +39,7 @@ mutex 0x........ was first observed at:
 
 
 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:?)
diff --git a/drd/tests/tc20_verifywrap.stderr.exp-glibc2.8 b/drd/tests/tc20_verifywrap.stderr.exp-glibc2.8
index a0306c6f02..35c0b20336 100644
--- a/drd/tests/tc20_verifywrap.stderr.exp-glibc2.8
+++ b/drd/tests/tc20_verifywrap.stderr.exp-glibc2.8
@@ -39,7 +39,7 @@ mutex 0x........ was first observed at:
 
 
 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:?)
diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3 b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
index 32b404e0a2..bf9571cb6d 100644
--- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
+++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
@@ -55,7 +55,7 @@ mutex 0x........ was first observed at:
 [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:?)
diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
index 74731b99ce..8791b8cb71 100644
--- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
+++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
@@ -66,7 +66,7 @@ mutex 0x........ was first observed at:
 [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:?)
diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5 b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5
index 6dc3b414a7..3f78f2d4c9 100644
--- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5
+++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5
@@ -54,7 +54,7 @@ mutex 0x........ was first observed at:
 [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:?)
diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc
index 3402d15489..83f3f8861f 100644
--- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc
+++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc
@@ -54,7 +54,7 @@ mutex 0x........ was first observed at:
 [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:?)
diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8 b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
index e399e1c1b2..7d7c64a5b8 100644
--- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
+++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
@@ -54,7 +54,7 @@ mutex 0x........ was first observed at:
 [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:?)
diff --git a/drd/tests/tc23_bogus_condwait.stderr.exp-darwin b/drd/tests/tc23_bogus_condwait.stderr.exp-darwin
index 4afc314b47..3770f6e67b 100644
--- a/drd/tests/tc23_bogus_condwait.stderr.exp-darwin
+++ b/drd/tests/tc23_bogus_condwait.stderr.exp-darwin
@@ -10,15 +10,15 @@ semaphore 0x........ was first observed at:
 
 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 @@ mutex 0x........ was first observed at:
 
 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:?)
diff --git a/drd/tests/tc23_bogus_condwait.stderr.exp-linux-ppc b/drd/tests/tc23_bogus_condwait.stderr.exp-linux-ppc
index a7ca608a5b..135ea9afee 100644
--- a/drd/tests/tc23_bogus_condwait.stderr.exp-linux-ppc
+++ b/drd/tests/tc23_bogus_condwait.stderr.exp-linux-ppc
@@ -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)
diff --git a/drd/tests/tc23_bogus_condwait.stderr.exp-linux-x86 b/drd/tests/tc23_bogus_condwait.stderr.exp-linux-x86
index 268051de9a..eb619bd2d0 100644
--- a/drd/tests/tc23_bogus_condwait.stderr.exp-linux-x86
+++ b/drd/tests/tc23_bogus_condwait.stderr.exp-linux-x86
@@ -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 @@ cond 0x........ was first observed at:
 
 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 @@ mutex 0x........ was first observed at:
 
 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 @@ mutex 0x........ was first observed at:
 
 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 @@ rwlock 0x........ was first observed at:
 
 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 @@ rwlock 0x........ was first observed at:
 
 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 @@ mutex 0x........ was first observed at:
 
 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:
-- 
2.47.3