From: Philippe Waroquiers <philippe.waroquiers@skynet.be>
Date: Fri, 6 Jun 2014 23:45:46 +0000 (+0000)
Subject: have helgrind filter_stderr transforming tid n into tid #x
X-Git-Tag: svn/VALGRIND_3_10_0~437
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f722418ac2845f86f89ccf30dc5a397845bb088;p=thirdparty%2Fvalgrind.git

have helgrind filter_stderr transforming tid n into tid #x
to avoid gdbserver_tests/hginfo random failures
caused by thread scheduling differences


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

diff --git a/gdbserver_tests/hginfo.stderrB.exp b/gdbserver_tests/hginfo.stderrB.exp
index 9855e3c22a..9e4394085d 100644
--- a/gdbserver_tests/hginfo.stderrB.exp
+++ b/gdbserver_tests/hginfo.stderrB.exp
@@ -3,7 +3,7 @@ vgdb-error value changed from 0 to 999999
 Lock ga 0x........ {
  Address 0x........ is 0 bytes inside data symbol "mx"
    kind   mbRec
- { W1:thread #x tid 2 }
+ { W1:thread #x tid #x }
 }
  Address 0x........ is 0 bytes inside a block of size 1,008 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
@@ -13,6 +13,6 @@ Lock ga 0x........ {
 Lock ga 0x........ {
  Address 0x........ is 0 bytes inside data symbol "mx"
    kind   mbRec
- { W1:thread #x tid 3 }
+ { W1:thread #x tid #x }
 }
  Address 0x........ is 0 bytes inside an unallocated block of size 1,008 in arena "client"
diff --git a/helgrind/tests/filter_stderr b/helgrind/tests/filter_stderr
index 30975dfa60..3b330329ea 100755
--- a/helgrind/tests/filter_stderr
+++ b/helgrind/tests/filter_stderr
@@ -8,10 +8,11 @@ $dir/../../tests/filter_stderr_basic                    |
 $dir/../../tests/filter_addresses                       |
 
 # get rid of the numbers in bits of text "Thread #n", "thread #n",
-# "Thread n" and "thread n",
+# "Thread n" and "thread n", "tid n"
 # as these make some tests more scheduling sensitive -- those where
 # there are multiple threads which play interchangeable roles.
 sed \
+ -e "s/tid [0-9][0-9]*/tid #x/g" \
  -e "s/hread #[0-9][0-9]*/hread #x/g" \
  -e "s/hread [0-9][0-9]*/hread x/g" |