drd/tests/fp_race_xml: Filter out thread number and vector clock information
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12347 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/drd/tests/filter_xml_and_thread_no b/drd/tests/filter_xml_and_thread_no
index 4e65091..a9f7ac1 100755
--- a/drd/tests/filter_xml_and_thread_no
+++ b/drd/tests/filter_xml_and_thread_no
@@ -1,3 +1,5 @@
#! /bin/sh
-../../memcheck/tests/filter_xml | ./filter_thread_no
+../../memcheck/tests/filter_xml |
+./filter_thread_no |
+sed 's/ vc: \[[0-9:, ]*\]/ vc: [ ... ]/g'
diff --git a/drd/tests/fp_race_xml.stderr.exp b/drd/tests/fp_race_xml.stderr.exp
index 9074bbf..73a530e 100644
--- a/drd/tests/fp_race_xml.stderr.exp
+++ b/drd/tests/fp_race_xml.stderr.exp
@@ -37,7 +37,7 @@
<unique>0x........</unique>
<tid>...</tid>
<kind>ConflictingAccess</kind>
- <what>Conflicting load by thread 1 at 0x........ size 8</what>
+ <what>Conflicting load by thread x at 0x........ size 8</what>
<stack>
<frame>
<ip>0x........</ip>
@@ -49,7 +49,7 @@
</frame>
</stack>
<auxwhat>Location 0x........ is 0 bytes inside local var "s_d3"</auxwhat>
- <xauxwhat><text>declared at fp_race.c:24, in frame #? of thread 1</text> <file>fp_race.c</file> <line>...</line> </xauxwhat>
+ <xauxwhat><text>declared at fp_race.c:24, in frame #? of thread x</text> <file>fp_race.c</file> <line>...</line> </xauxwhat>
<other_segment_start>
</other_segment_start>
<other_segment_end>
@@ -60,7 +60,7 @@
<unique>0x........</unique>
<tid>...</tid>
<kind>ConflictingAccess</kind>
- <what>Conflicting store by thread 1 at 0x........ size 8</what>
+ <what>Conflicting store by thread x at 0x........ size 8</what>
<stack>
<frame>
<ip>0x........</ip>
@@ -72,14 +72,14 @@
</frame>
</stack>
<auxwhat>Location 0x........ is 0 bytes inside local var "s_d3"</auxwhat>
- <xauxwhat><text>declared at fp_race.c:24, in frame #? of thread 1</text> <file>fp_race.c</file> <line>...</line> </xauxwhat>
+ <xauxwhat><text>declared at fp_race.c:24, in frame #? of thread x</text> <file>fp_race.c</file> <line>...</line> </xauxwhat>
<other_segment_start>
</other_segment_start>
<other_segment_end>
</other_segment_end>
</error>
- <trace><text>drd_post_thread_join joiner = 1, joinee = 2, new vc: [ 1: 8, 2: 3 ]</text></trace>
+ <trace><text>drd_post_thread_join joiner = 1, joinee = 2, new vc: [ ... ]</text></trace>
<trace><text>drd_thread_finished tid = 1</text></trace>
<status>
diff --git a/drd/tests/fp_race_xml.vgtest b/drd/tests/fp_race_xml.vgtest
index 12b3b57..712404c 100644
--- a/drd/tests/fp_race_xml.vgtest
+++ b/drd/tests/fp_race_xml.vgtest
@@ -1,4 +1,4 @@
prereq: ./supported_libpthread
vgopts: --read-var-info=yes --xml=yes --xml-fd=2 --trace-fork-join=yes
prog: fp_race
-stderr_filter: ../../memcheck/tests/filter_xml
+stderr_filter: ./filter_xml_and_thread_no