Removed frame numbers and debuginfo reader warnings from output.

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

diff --git a/exp-drd/tests/filter_stderr b/exp-drd/tests/filter_stderr
index aebffc03c6f06ea47de1f20f251b9d80f868d458..f18e8c70fbe7484a45c0b846fe5145788a2b5a95 100755 (executable)
--- a/exp-drd/tests/filter_stderr
+++ b/exp-drd/tests/filter_stderr
@@ -11,6 +11,8 @@ $dir/../../tests/filter_stderr_basic |
 sed \
 -e "/^exp-drd, a data race detector\.$/d" \
 -e "s/^Allocation context: stack of thread \([0-9]*\), offset -[0-9]*$/Allocation context: stack of thread \1, offset .../" \
+-e "/^warning: evaluate_Dwarf3_Expr: unhandled DW_OP_.*/d" \
+-e "s/, in frame #[0-9]* of thread /, in frame #? of thread /" \
 -e "s/(tc20_verifywrap.c:261)/(tc20_verifywrap.c:262)/" \
 -e "/^NOTE: This is an Experimental-Class Valgrind Tool.$/d"  \
 -e "/^Copyright (C) 2006-200., and GNU GPL'd, by Bart Van Assche.$/d" \

diff --git a/exp-drd/tests/fp_race.stderr.exp b/exp-drd/tests/fp_race.stderr.exp
index 153ce9609089c6262a885a402825a65ab40c8c6c..09e51318754d22d318338af3924ac79f379f32e1 100644 (file)
--- a/exp-drd/tests/fp_race.stderr.exp
+++ b/exp-drd/tests/fp_race.stderr.exp
@@ -2,7 +2,7 @@
 Conflicting load by main at 0x........ size 8
    at 0x........: main (fp_race.c:?)
 Location 0x........ is 0 bytes inside local var "s_d3"
-declared at fp_race.c:47, in frame #0 of thread 1
+declared at fp_race.c:47, in frame #? of thread 1
 Other segment start (thread_func)
    (thread finished, call stack no longer available)
 Other segment end (thread_func)
@@ -11,7 +11,7 @@ Other segment end (thread_func)
 Conflicting store by main at 0x........ size 8
    at 0x........: main (fp_race.c:?)
 Location 0x........ is 0 bytes inside local var "s_d3"
-declared at fp_race.c:47, in frame #0 of thread 1
+declared at fp_race.c:47, in frame #? of thread 1
 Other segment start (thread_func)
    (thread finished, call stack no longer available)
 Other segment end (thread_func)

diff --git a/exp-drd/tests/hg03_inherit.stderr.exp b/exp-drd/tests/hg03_inherit.stderr.exp
index 3102848f89b9feb771e325cb9070d142db56a2ac..f1d185e298abe1c33723e8c2f71c344baccec104 100644 (file)
--- a/exp-drd/tests/hg03_inherit.stderr.exp
+++ b/exp-drd/tests/hg03_inherit.stderr.exp
@@ -6,7 +6,7 @@ Conflicting store by thread 3 at 0x........ size 4
    by 0x........: start_thread (in libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside shared[1],
-declared at hg03_inherit.c:11, in frame #0 of thread 3
+declared at hg03_inherit.c:11, in frame #? of thread 3
 Other segment start (thread 1)
    at 0x........: pthread_join (drd_intercepts.c:?)
    by 0x........: main (hg03_inherit.c:49)
@@ -21,7 +21,7 @@ Conflicting store by thread 3 at 0x........ size 4
    by 0x........: start_thread (in libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside shared[1],
-declared at hg03_inherit.c:11, in frame #0 of thread 3
+declared at hg03_inherit.c:11, in frame #? of thread 3
 Other segment start (thread 1)
    at 0x........: pthread_join (drd_intercepts.c:?)
    by 0x........: main (hg03_inherit.c:49)

diff --git a/exp-drd/tests/hg04_race.stderr.exp b/exp-drd/tests/hg04_race.stderr.exp
index 8679d06394c32b35a45bf7d470e242322da551ba..abb00f2accf7bcd088b9cfe5fab694885a280255 100644 (file)
--- a/exp-drd/tests/hg04_race.stderr.exp
+++ b/exp-drd/tests/hg04_race.stderr.exp
@@ -6,7 +6,7 @@ Conflicting load by thread 2 at 0x........ size 4
    by 0x........: start_thread (in libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside local var "shared"
-declared at hg04_race.c:6, in frame #0 of thread 2
+declared at hg04_race.c:6, in frame #? of thread 2
 Other segment start (thread 2)
    (thread finished, call stack no longer available)
 Other segment end (thread 2)
@@ -18,7 +18,7 @@ Conflicting store by thread 2 at 0x........ size 4
    by 0x........: start_thread (in libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside local var "shared"
-declared at hg04_race.c:6, in frame #0 of thread 2
+declared at hg04_race.c:6, in frame #? of thread 2
 Other segment start (thread 2)
    (thread finished, call stack no longer available)
 Other segment end (thread 2)

diff --git a/exp-drd/tests/hg05_race2.stderr.exp b/exp-drd/tests/hg05_race2.stderr.exp
index 743a78fad15d3c0290768002d14c15c61669d799..e83187204d6a4a89a439546a4ed141eb632209fc 100644 (file)
--- a/exp-drd/tests/hg05_race2.stderr.exp
+++ b/exp-drd/tests/hg05_race2.stderr.exp
@@ -6,7 +6,7 @@ Conflicting load by thread 2 at 0x........ size 4
    by 0x........: start_thread (in 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 #4 of thread 1
+declared at hg05_race2.c:24, in frame #? of thread 1
 Other segment start (thread 2)
    (thread finished, call stack no longer available)
 Other segment end (thread 2)
@@ -18,7 +18,7 @@ Conflicting store by thread 2 at 0x........ size 4
    by 0x........: start_thread (in 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 #4 of thread 1
+declared at hg05_race2.c:24, in frame #? of thread 1
 Other segment start (thread 2)
    (thread finished, call stack no longer available)
 Other segment end (thread 2)

diff --git a/exp-drd/tests/rwlock_race.stderr.exp b/exp-drd/tests/rwlock_race.stderr.exp
index fdcfccc3aaeb0c7d307ed8a5de5f0c3fe5b38ab9..ef673b226cd7dcdb7f8d85eccc3c8e4ee7da2bd0 100644 (file)
--- a/exp-drd/tests/rwlock_race.stderr.exp
+++ b/exp-drd/tests/rwlock_race.stderr.exp
@@ -6,7 +6,7 @@ Conflicting load by thread 2 at 0x........ size 4
    by 0x........: start_thread (in 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 #0 of thread 2
+declared at rwlock_race.c:17, in frame #? of thread 2
 Other segment start (thread 2)
    (thread finished, call stack no longer available)
 Other segment end (thread 2)
@@ -18,7 +18,7 @@ Conflicting store by thread 2 at 0x........ size 4
    by 0x........: start_thread (in 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 #0 of thread 2
+declared at rwlock_race.c:17, in frame #? of thread 2
 Other segment start (thread 2)
    (thread finished, call stack no longer available)
 Other segment end (thread 2)

diff --git a/exp-drd/tests/sem_as_mutex.stderr.exp b/exp-drd/tests/sem_as_mutex.stderr.exp
index 8a28a5f0ef90aab158da52671937e756ad98a68e..e6b9616845e412400c80b51d62ff196a2e3c85ab 100644 (file)
--- a/exp-drd/tests/sem_as_mutex.stderr.exp
+++ b/exp-drd/tests/sem_as_mutex.stderr.exp
@@ -2,7 +2,7 @@
 Conflicting load by main at 0x........ size 8
    at 0x........: main (sem_as_mutex.c:?)
 Location 0x........ is 0 bytes inside local var "s_d3"
-declared at sem_as_mutex.c:48, in frame #0 of thread 1
+declared at sem_as_mutex.c:48, in frame #? of thread 1
 Other segment start (thread_func)
    (thread finished, call stack no longer available)
 Other segment end (thread_func)
@@ -11,7 +11,7 @@ Other segment end (thread_func)
 Conflicting store by main at 0x........ size 8
    at 0x........: main (sem_as_mutex.c:?)
 Location 0x........ is 0 bytes inside local var "s_d3"
-declared at sem_as_mutex.c:48, in frame #0 of thread 1
+declared at sem_as_mutex.c:48, in frame #? of thread 1
 Other segment start (thread_func)
    (thread finished, call stack no longer available)
 Other segment end (thread_func)