Modified filter_stderr to filter out even more platform differences.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10567

diff --git a/drd/tests/filter_stderr b/drd/tests/filter_stderr
index 09652c9cff51665991cc3b5bb46f0c45ca8436cd..e726994d99f0e75326b51659cc8cc6d2345f1158 100755 (executable)
--- 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 f07dddaef758d886889e0c7c61ce888dc886568f..5a2f60d58f53e9a211c09c35359e4a2e18dc898f 100644 (file)
--- 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 595dc3ea1cd671d13cf70d4c7c0044004df5173d..810788851ad44a5365c42f45f97afd8fb63f4859 100644 (file)
--- 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 7391bdc48ab75381f82ff2d304bea6f42973d0f5..c2788560b3827cd5c88b980cf0c265e35c7cc2a8 100644 (file)
--- 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 9b10b5ded38efa207ff113febf7226461baaed82..8e2e8862b281af7ab4b1835f71a62a6243b01a35 100644 (file)
--- 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 d120ca6ab732b74018bb1dc76483e278696939ba..7dcf618830fc37f3a5fad28aaad77a2cab2ab769 100644 (file)
--- 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 bf988094268889f60eb7fa77e56b6ec3c342aab9..7236a3e82682dc8e2c8f4e36c9715fa8f3d02b35 100644 (file)
--- 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 a0306c6f0233e6f9e738ca18715b9e60e06b1146..35c0b2033686b95773b40cafa6fed6ee62b46bdf 100644 (file)
--- 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 32b404e0a2da58b909fb9d85e16829b04a231d4d..bf9571cb6d2b2918dcb15784cea5a177a86864aa 100644 (file)
--- 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 74731b99ce48ba440c1baf48976f9efdd565fbd5..8791b8cb716dc05052f88f1da461cc7b55e42b7b 100644 (file)
--- 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 6dc3b414a789778a2e48d52c930d64574b8f9963..3f78f2d4c9528cc04266da1f7e52bd975066420e 100644 (file)
--- 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 3402d15489fab122bbec06afb7268bdd9e450c3e..83f3f8861f2cdd9a1ef30d09136a559f4270be0e 100644 (file)
--- 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 e399e1c1b224e22776439a3d17477c11681a19fe..7d7c64a5b8f97072531b0b0efa2472bef7cb5a87 100644 (file)
--- 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 4afc314b4719e9179abfe0d91059fa87f7e11239..3770f6e67b227f552ca349a0d0d5c23068092765 100644 (file)
--- 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 a7ca608a5b3d0278c57e04b38eaf89b95ad67c8f..135ea9afee96dc325f79dfdc694129355f874fff 100644 (file)
--- 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 268051de9a35b8cb609d97d108e868addb2cead8..eb619bd2d0d96a18482bec94ca281ea669f3d362 100644 (file)
--- 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: