Change things so that helgrind regtests pass on my machine -- changed stderr

filters to strip out varying things, and changed outputs correspondingly.  Yell
if this breaks them for you.

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

diff --git a/helgrind/tests/deadlock.stderr.exp b/helgrind/tests/deadlock.stderr.exp
index e074ddf8a847027946997011d72d4dac20362c4e..0dd708d669f11d653d821fc96ccaaf99fdd8bf96 100644 (file)
--- a/helgrind/tests/deadlock.stderr.exp
+++ b/helgrind/tests/deadlock.stderr.exp
@@ -1,15 +1,15 @@
 
 Thread 3:
 Mutex 0x........(m1) locked in inconsistent order
-   at 0x........: __pthread_mutex_lock (vg_libpthread.c:945)
+   at 0x........: __pthread_mutex_lock (vg_libpthread.c:...)
    by 0x........: t2 (deadlock.c:20)
-   by 0x........: thread_wrapper (vg_libpthread.c:661)
+   by 0x........: thread_wrapper (vg_libpthread.c:...)
    by 0x........: do__quit (vg_scheduler.c:1791)
  while holding locks 0x........(m2)
   0x........(m2) last locked at
-   at 0x........: __pthread_mutex_lock (vg_libpthread.c:945)
+   at 0x........: __pthread_mutex_lock (vg_libpthread.c:...)
    by 0x........: t2 (deadlock.c:19)
-   by 0x........: thread_wrapper (vg_libpthread.c:661)
+   by 0x........: thread_wrapper (vg_libpthread.c:...)
    by 0x........: do__quit (vg_scheduler.c:1791)
   while depending on locks 0x........(m1)
 

diff --git a/helgrind/tests/filter_stderr b/helgrind/tests/filter_stderr
index 67045440e850985391ce6ba1ac1f08c386ebffc8..1ef3004cecc77b85eabfa8fe03a5d014679fa921 100755 (executable)
--- a/helgrind/tests/filter_stderr
+++ b/helgrind/tests/filter_stderr
@@ -7,11 +7,13 @@ dir=`dirname $0`
 $dir/../../tests/filter_stderr_basic |
 $dir/../../tests/filter_addresses |
 
+# Anonymise paths like "section of /foo/bar/helgrind/tests/baz)"
+sed "s/section of \/.*helgrind\/tests.*$/section of \/...helgrind\/tests.../" |
+
 # Output looks like...
 #
 # ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
 # [0] = { }
 # ==27116== 0 possible data races found
-
 sed "/ERROR SUMMARY:/ , /0 possible data races found/ d"
 

diff --git a/helgrind/tests/inherit.stderr.exp b/helgrind/tests/inherit.stderr.exp
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..139597f9cb07c5d48bed18984ec4747f4b4f3438 100644 (file)
--- a/helgrind/tests/inherit.stderr.exp
+++ b/helgrind/tests/inherit.stderr.exp
@@ -0,0 +1,2 @@
+
+

diff --git a/helgrind/tests/race.stderr.exp b/helgrind/tests/race.stderr.exp
index 310a6419f05d96a4fb3c22ee99336b3c37f60691..198374ab9f040d776990e7d21bb715f6d98f0524 100644 (file)
--- a/helgrind/tests/race.stderr.exp
+++ b/helgrind/tests/race.stderr.exp
@@ -2,8 +2,8 @@
 Thread 3:
 Possible data race writing variable at 0x........ (shared)
    at 0x........: th (race.c:10)
-   by 0x........: thread_wrapper (vg_libpthread.c:661)
+   by 0x........: thread_wrapper (vg_libpthread.c:...)
    by 0x........: do__quit (vg_scheduler.c:1791)
-  Address 0x........ is in BSS section of /home/jeremy/cvs/valgrind/helgrind/tests/race
+  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 7093a6313da2ef6125a60e1f455b1042c84167b5..d815d360035e46e3be0b2df3efdf6e4088d24028 100644 (file)
--- a/helgrind/tests/race2.stderr.exp
+++ b/helgrind/tests/race2.stderr.exp
@@ -2,7 +2,7 @@
 Thread 3:
 Possible data race writing variable at 0x........ 
    at 0x........: th (race2.c:17)
-   by 0x........: thread_wrapper (vg_libpthread.c:661)
+   by 0x........: thread_wrapper (vg_libpthread.c:...)
    by 0x........: do__quit (vg_scheduler.c:1791)
   Address 0x........ == &(f->poot[5].plop[11]) at race2.c:17
   Previous state: shared RO, no locks

diff --git a/tests/filter_stderr_basic b/tests/filter_stderr_basic
index f13167d251451b3a6b659048ce22f8f3502bfa14..ac34fa9514813a3d24d0e0b3c260ebac30671d9a 100755 (executable)
--- a/tests/filter_stderr_basic
+++ b/tests/filter_stderr_basic
@@ -20,6 +20,9 @@ sed "s/vg_replace_malloc.c:[0-9]\+/vg_replace_malloc.c:.../"           |
 # Anonymise vg_intercept lines
 sed "s/vg_intercept.c:[0-9]\+/vg_intercept.c:.../"                     |
 
+# Anonymise vg_libpthread lines
+sed "s/vg_libpthread.c:[0-9]\+/vg_libpthread.c:.../"                   |
+
 # Reduce some libc incompatibility
 sed "s/ __getsockname / getsockname /"                                 |
 sed "s/ __sigaction / sigaction /"                                     |