Filter out line numbers in vg_scheduler.c in Helgrind's regtests.

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

diff --git a/helgrind/tests/deadlock.stderr.exp b/helgrind/tests/deadlock.stderr.exp
index 0dd708d669f11d653d821fc96ccaaf99fdd8bf96..d02e768be8caa66ee8e84a18eb55cd4cd7907df3 100644 (file)
--- a/helgrind/tests/deadlock.stderr.exp
+++ b/helgrind/tests/deadlock.stderr.exp
@@ -4,12 +4,12 @@ Mutex 0x........(m1) locked in inconsistent order
    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 1ef3004cecc77b85eabfa8fe03a5d014679fa921..92ce7c1b66c400dc1ed561da33afcd87887bc4d1 100755 (executable)
--- a/helgrind/tests/filter_stderr
+++ b/helgrind/tests/filter_stderr
@@ -10,6 +10,9 @@ $dir/../../tests/filter_addresses |
 # 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 198374ab9f040d776990e7d21bb715f6d98f0524..a75ed3470ae942731ca5ad0dcdf351432a512859 100644 (file)
--- a/helgrind/tests/race.stderr.exp
+++ b/helgrind/tests/race.stderr.exp
@@ -3,7 +3,7 @@ Thread 3:
 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 d815d360035e46e3be0b2df3efdf6e4088d24028..3cdcd983922182c805b8d45f8a70fcdb6c1289a8 100644 (file)
--- a/helgrind/tests/race2.stderr.exp
+++ b/helgrind/tests/race2.stderr.exp
@@ -3,7 +3,7 @@ Thread 3:
 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