More finetuning of output filtering.

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

diff --git a/exp-drd/tests/filter_stderr b/exp-drd/tests/filter_stderr
index f18e8c70fbe7484a45c0b846fe5145788a2b5a95..a4b8e19cd447a7815496e13b9848698e792b3888 100755 (executable)
--- a/exp-drd/tests/filter_stderr
+++ b/exp-drd/tests/filter_stderr
@@ -17,8 +17,7 @@ sed \
 -e "/^NOTE: This is an Experimental-Class Valgrind Tool.$/d"  \
 -e "/^Copyright (C) 2006-200., and GNU GPL'd, by Bart Van Assche.$/d" \
 -e "s/\(pthread_create.c:[0-9]*\)/in libpthread-?.?.so/" \
--e "s/in [^ ]*libpthread-[0-9]*\.[0-9]*\.so/in libpthread-?.?.so/" \
--e "s/in [^ ]*libpthread-[0-9]*\.[0-9]*\.[0-9]*\.so/in libpthread-?.?.so/" \
+-e "s:[A-Za-z_]* (in [^ ]*libpthread-[0-9.]*\.so):(within libpthread-?.?.so):" \
 -e "s/ (\([a-zA-Z_]*\.c\):[0-9]*)/ (\1:?)/" \
 -e "s/ (\([a-zA-Z_]*\.cpp\):[0-9]*)/ (\1:?)/" |
 

diff --git a/exp-drd/tests/hg03_inherit.stderr.exp b/exp-drd/tests/hg03_inherit.stderr.exp
index f1d185e298abe1c33723e8c2f71c344baccec104..fbd7110887b6c182e5dd0a377ec458e90a232162 100644 (file)
--- a/exp-drd/tests/hg03_inherit.stderr.exp
+++ b/exp-drd/tests/hg03_inherit.stderr.exp
@@ -3,7 +3,7 @@ Thread 3:
 Conflicting store by thread 3 at 0x........ size 4
    at 0x........: t2 (hg03_inherit.c:28)
    by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
-   by 0x........: start_thread (in libpthread-?.?.so)
+   by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside shared[1],
 declared at hg03_inherit.c:11, in frame #? of thread 3
@@ -11,14 +11,14 @@ Other segment start (thread 1)
    at 0x........: pthread_join (drd_intercepts.c:?)
    by 0x........: main (hg03_inherit.c:49)
 Other segment end (thread 1)
-   at 0x........: pthread_join (in libpthread-?.?.so)
+   at 0x........: (within libpthread-?.?.so)
    by 0x........: pthread_join (drd_intercepts.c:?)
    by 0x........: main (hg03_inherit.c:63)
 
 Conflicting store by thread 3 at 0x........ size 4
    at 0x........: t2 (hg03_inherit.c:29)
    by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
-   by 0x........: start_thread (in libpthread-?.?.so)
+   by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside shared[1],
 declared at hg03_inherit.c:11, in frame #? of thread 3
@@ -26,7 +26,7 @@ Other segment start (thread 1)
    at 0x........: pthread_join (drd_intercepts.c:?)
    by 0x........: main (hg03_inherit.c:49)
 Other segment end (thread 1)
-   at 0x........: pthread_join (in libpthread-?.?.so)
+   at 0x........: (within /lib/ld-2.6.1.so)
    by 0x........: pthread_join (drd_intercepts.c:?)
    by 0x........: main (hg03_inherit.c:63)
 

diff --git a/exp-drd/tests/hg04_race.stderr.exp b/exp-drd/tests/hg04_race.stderr.exp
index abb00f2accf7bcd088b9cfe5fab694885a280255..c0dd806540fd9030590f4f845d0403b2ab492aaa 100644 (file)
--- a/exp-drd/tests/hg04_race.stderr.exp
+++ b/exp-drd/tests/hg04_race.stderr.exp
@@ -3,7 +3,7 @@ Thread 2:
 Conflicting load by thread 2 at 0x........ size 4
    at 0x........: th (hg04_race.c:10)
    by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
-   by 0x........: start_thread (in libpthread-?.?.so)
+   by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside local var "shared"
 declared at hg04_race.c:6, in frame #? of thread 2
@@ -15,7 +15,7 @@ Other segment end (thread 2)
 Conflicting store by thread 2 at 0x........ size 4
    at 0x........: th (hg04_race.c:10)
    by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
-   by 0x........: start_thread (in libpthread-?.?.so)
+   by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside local var "shared"
 declared at hg04_race.c:6, in frame #? of thread 2

diff --git a/exp-drd/tests/hg05_race2.stderr.exp b/exp-drd/tests/hg05_race2.stderr.exp
index e83187204d6a4a89a439546a4ed141eb632209fc..acf95304e02056b19723db96f6921f58d1774e57 100644 (file)
--- a/exp-drd/tests/hg05_race2.stderr.exp
+++ b/exp-drd/tests/hg05_race2.stderr.exp
@@ -3,7 +3,7 @@ Thread 2:
 Conflicting load by thread 2 at 0x........ size 4
    at 0x........: th (hg05_race2.c:17)
    by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
-   by 0x........: start_thread (in libpthread-?.?.so)
+   by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside foo.poot[5].plop[11],
 declared at hg05_race2.c:24, in frame #? of thread 1
@@ -15,7 +15,7 @@ Other segment end (thread 2)
 Conflicting store by thread 2 at 0x........ size 4
    at 0x........: th (hg05_race2.c:17)
    by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
-   by 0x........: start_thread (in libpthread-?.?.so)
+   by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside foo.poot[5].plop[11],
 declared at hg05_race2.c:24, in frame #? of thread 1

diff --git a/exp-drd/tests/pth_cond_race.stderr.exp b/exp-drd/tests/pth_cond_race.stderr.exp
index a097b0a6369f67f6d1cc1bc7af0d6f9fa7c19305..00746c9dbb25bb42ef4fa14d21b6049879686c4b 100644 (file)
--- a/exp-drd/tests/pth_cond_race.stderr.exp
+++ b/exp-drd/tests/pth_cond_race.stderr.exp
@@ -4,7 +4,7 @@ Race condition: condition variable 0x........ has been signalled but the associa
    at 0x........: pthread_cond_signal* (drd_intercepts.c:?)
    by 0x........: thread_func (pth_cond_race.c:?)
    by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
-   by 0x........: start_thread (in libpthread-?.?.so)
+   by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 
 ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)

diff --git a/exp-drd/tests/rwlock_race.stderr.exp b/exp-drd/tests/rwlock_race.stderr.exp
index ef673b226cd7dcdb7f8d85eccc3c8e4ee7da2bd0..211b727e5e1add1183697d9aa7de057dbd58aee2 100644 (file)
--- a/exp-drd/tests/rwlock_race.stderr.exp
+++ b/exp-drd/tests/rwlock_race.stderr.exp
@@ -3,7 +3,7 @@ Thread 2:
 Conflicting load by thread 2 at 0x........ size 4
    at 0x........: thread (rwlock_race.c:?)
    by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
-   by 0x........: start_thread (in libpthread-?.?.so)
+   by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside local var "s_racy"
 declared at rwlock_race.c:17, in frame #? of thread 2
@@ -15,7 +15,7 @@ Other segment end (thread 2)
 Conflicting store by thread 2 at 0x........ size 4
    at 0x........: thread (rwlock_race.c:?)
    by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
-   by 0x........: start_thread (in libpthread-?.?.so)
+   by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside local var "s_racy"
 declared at rwlock_race.c:17, in frame #? of thread 2

diff --git a/exp-drd/tests/tc09_bad_unlock.stderr.exp b/exp-drd/tests/tc09_bad_unlock.stderr.exp
index 052df38c19dcd8cd46e99babaf13eccd4eaecee2..ef78d36814264040352f085ae3da3384523dc516 100644 (file)
--- a/exp-drd/tests/tc09_bad_unlock.stderr.exp
+++ b/exp-drd/tests/tc09_bad_unlock.stderr.exp
@@ -9,7 +9,7 @@ Mutex not locked by calling thread: mutex 0x........, recursion count 1, owner 1
    at 0x........: pthread_mutex_unlock (drd_intercepts.c:?)
    by 0x........: child_fn (tc09_bad_unlock.c:11)
    by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
-   by 0x........: start_thread (in libpthread-?.?.so)
+   by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 
 Thread 1:
@@ -32,7 +32,7 @@ Mutex not locked by calling thread: mutex 0x........, recursion count 1, owner 1
    at 0x........: pthread_mutex_unlock (drd_intercepts.c:?)
    by 0x........: child_fn (tc09_bad_unlock.c:11)
    by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
-   by 0x........: start_thread (in libpthread-?.?.so)
+   by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 
 Thread 1:

diff --git a/exp-drd/tests/tc23_bogus_condwait.stderr.exp b/exp-drd/tests/tc23_bogus_condwait.stderr.exp
index 379122a194f1207d4228697ec7f029a89319ca2e..7b6853eec4bee9d1cece4ab24684ad99f9137ace 100644 (file)
--- a/exp-drd/tests/tc23_bogus_condwait.stderr.exp
+++ b/exp-drd/tests/tc23_bogus_condwait.stderr.exp
@@ -8,7 +8,7 @@ Race condition: condition variable 0x........ has been signalled but the associa
    at 0x........: pthread_cond_signal* (drd_intercepts.c:?)
    by 0x........: rescue_me (tc23_bogus_condwait.c:20)
    by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
-   by 0x........: start_thread (in libpthread-?.?.so)
+   by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 
 Thread 1:
@@ -21,7 +21,7 @@ Race condition: condition variable 0x........ has been signalled but the associa
    at 0x........: pthread_cond_signal* (drd_intercepts.c:?)
    by 0x........: rescue_me (tc23_bogus_condwait.c:24)
    by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
-   by 0x........: start_thread (in libpthread-?.?.so)
+   by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 
 Thread 1:
@@ -34,7 +34,7 @@ Race condition: condition variable 0x........ has been signalled but the associa
    at 0x........: pthread_cond_signal* (drd_intercepts.c:?)
    by 0x........: rescue_me (tc23_bogus_condwait.c:28)
    by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
-   by 0x........: start_thread (in libpthread-?.?.so)
+   by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 
 Thread 1:
@@ -47,7 +47,7 @@ Race condition: condition variable 0x........ has been signalled but the associa
    at 0x........: pthread_cond_signal* (drd_intercepts.c:?)
    by 0x........: rescue_me (tc23_bogus_condwait.c:32)
    by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
-   by 0x........: start_thread (in libpthread-?.?.so)
+   by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 The impossible happened: mutex 0x........ is locked simultaneously by two threads (recursion count 1, owners 2 and 1) !
 
@@ -56,7 +56,7 @@ Mutex not locked by calling thread: mutex 0x........, recursion count 2, owner 1
    at 0x........: pthread_mutex_unlock (drd_intercepts.c:?)
    by 0x........: grab_the_lock (tc23_bogus_condwait.c:42)
    by 0x........: vg_thread_wrapper (drd_intercepts.c:?)
-   by 0x........: start_thread (in libpthread-?.?.so)
+   by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 
 ERROR SUMMARY: 9 errors from 9 contexts (suppressed: 0 from 0)