|
From: <sv...@va...> - 2012-01-20 09:31:53
|
Author: bart
Date: 2012-01-20 09:27:15 +0000 (Fri, 20 Jan 2012)
New Revision: 12347
Log:
drd/tests/fp_race_xml: Filter out thread number and vector clock information
Modified:
trunk/drd/tests/filter_xml_and_thread_no
trunk/drd/tests/fp_race_xml.stderr.exp
trunk/drd/tests/fp_race_xml.vgtest
Modified: trunk/drd/tests/filter_xml_and_thread_no
===================================================================
--- trunk/drd/tests/filter_xml_and_thread_no 2012-01-19 19:52:15 UTC (rev 12346)
+++ trunk/drd/tests/filter_xml_and_thread_no 2012-01-20 09:27:15 UTC (rev 12347)
@@ -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'
Modified: trunk/drd/tests/fp_race_xml.stderr.exp
===================================================================
--- trunk/drd/tests/fp_race_xml.stderr.exp 2012-01-19 19:52:15 UTC (rev 12346)
+++ trunk/drd/tests/fp_race_xml.stderr.exp 2012-01-20 09:27:15 UTC (rev 12347)
@@ -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>
Modified: trunk/drd/tests/fp_race_xml.vgtest
===================================================================
--- trunk/drd/tests/fp_race_xml.vgtest 2012-01-19 19:52:15 UTC (rev 12346)
+++ trunk/drd/tests/fp_race_xml.vgtest 2012-01-20 09:27:15 UTC (rev 12347)
@@ -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
|