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
This commit is contained in:
Philippe Waroquiers 2014-06-06 23:45:46 +00:00
parent 7be4916bc2
commit 0f722418ac
2 changed files with 4 additions and 3 deletions

View File

@ -3,7 +3,7 @@ vgdb-error value changed from 0 to 999999
Lock ga 0x........ { Lock ga 0x........ {
Address 0x........ is 0 bytes inside data symbol "mx" Address 0x........ is 0 bytes inside data symbol "mx"
kind mbRec 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 Address 0x........ is 0 bytes inside a block of size 1,008 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...) at 0x........: malloc (vg_replace_malloc.c:...)
@ -13,6 +13,6 @@ Lock ga 0x........ {
Lock ga 0x........ { Lock ga 0x........ {
Address 0x........ is 0 bytes inside data symbol "mx" Address 0x........ is 0 bytes inside data symbol "mx"
kind mbRec 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" Address 0x........ is 0 bytes inside an unallocated block of size 1,008 in arena "client"

View File

@ -8,10 +8,11 @@ $dir/../../tests/filter_stderr_basic |
$dir/../../tests/filter_addresses | $dir/../../tests/filter_addresses |
# get rid of the numbers in bits of text "Thread #n", "thread #n", # 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 # as these make some tests more scheduling sensitive -- those where
# there are multiple threads which play interchangeable roles. # there are multiple threads which play interchangeable roles.
sed \ 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" \
-e "s/hread [0-9][0-9]*/hread x/g" | -e "s/hread [0-9][0-9]*/hread x/g" |