Filter out line numbers in vg_scheduler.c in Helgrind's regtests.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2012 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/helgrind/tests/deadlock.stderr.exp b/helgrind/tests/deadlock.stderr.exp
index 0dd708d..d02e768 100644
--- a/helgrind/tests/deadlock.stderr.exp
+++ b/helgrind/tests/deadlock.stderr.exp
@@ -4,12 +4,12 @@
at 0x........: __pthread_mutex_lock (vg_libpthread.c:...)
by 0x........: t2 (deadlock.c:20)
by 0x........: thread_wrapper (vg_libpthread.c:...)
- by 0x........: do__quit (vg_scheduler.c:1791)
+ by 0x........: do__quit (vg_scheduler.c:...)
while holding locks 0x........(m2)
0x........(m2) last locked at
at 0x........: __pthread_mutex_lock (vg_libpthread.c:...)
by 0x........: t2 (deadlock.c:19)
by 0x........: thread_wrapper (vg_libpthread.c:...)
- by 0x........: do__quit (vg_scheduler.c:1791)
+ by 0x........: do__quit (vg_scheduler.c:...)
while depending on locks 0x........(m1)
diff --git a/helgrind/tests/filter_stderr b/helgrind/tests/filter_stderr
index 1ef3004..92ce7c1 100755
--- a/helgrind/tests/filter_stderr
+++ b/helgrind/tests/filter_stderr
@@ -10,6 +10,9 @@
# Anonymise paths like "section of /foo/bar/helgrind/tests/baz)"
sed "s/section of \/.*helgrind\/tests.*$/section of \/...helgrind\/tests.../" |
+# Anonymise line numbers in vg_scheduler.c
+sed "s/vg_scheduler.c:[0-9]\+/vg_scheduler.c:.../" |
+
# Output looks like...
#
# ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/helgrind/tests/race.stderr.exp b/helgrind/tests/race.stderr.exp
index 198374a..a75ed34 100644
--- a/helgrind/tests/race.stderr.exp
+++ b/helgrind/tests/race.stderr.exp
@@ -3,7 +3,7 @@
Possible data race writing variable at 0x........ (shared)
at 0x........: th (race.c:10)
by 0x........: thread_wrapper (vg_libpthread.c:...)
- by 0x........: do__quit (vg_scheduler.c:1791)
+ by 0x........: do__quit (vg_scheduler.c:...)
Address 0x........ is in BSS section of /...helgrind/tests...
Previous state: shared RO, no locks
diff --git a/helgrind/tests/race2.stderr.exp b/helgrind/tests/race2.stderr.exp
index d815d36..3cdcd98 100644
--- a/helgrind/tests/race2.stderr.exp
+++ b/helgrind/tests/race2.stderr.exp
@@ -3,7 +3,7 @@
Possible data race writing variable at 0x........
at 0x........: th (race2.c:17)
by 0x........: thread_wrapper (vg_libpthread.c:...)
- by 0x........: do__quit (vg_scheduler.c:1791)
+ by 0x........: do__quit (vg_scheduler.c:...)
Address 0x........ == &(f->poot[5].plop[11]) at race2.c:17
Previous state: shared RO, no locks