|
From: <sv...@va...> - 2005-07-24 07:33:18
|
Author: sewardj
Date: 2005-07-24 08:33:15 +0100 (Sun, 24 Jul 2005)
New Revision: 4240
Log:
Rename tags in XML <status> block.
Modified:
trunk/coregrind/m_main.c
trunk/docs/internals/xml-output.txt
trunk/memcheck/tests/filter_xml
trunk/memcheck/tests/xml1.stderr.exp
trunk/memcheck/tests/xml1.stderr.exp2
trunk/memcheck/tests/xml1.stderr.exp64
Modified: trunk/coregrind/m_main.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_main.c 2005-07-24 07:23:54 UTC (rev 4239)
+++ trunk/coregrind/m_main.c 2005-07-24 07:33:15 UTC (rev 4240)
@@ -2819,8 +2819,8 @@
if (VG_(clo_xml)) {
HChar buf[50];
VG_(ctime)(buf);
- VG_(message)(Vg_UserMsg, "<status> <what>RUNNING</what> "
- "<when>%t</when> </status>", buf);
+ VG_(message)(Vg_UserMsg, "<status> <state>RUNNING</state> "
+ "<time>%t</time> </status>", buf);
VG_(message)(Vg_UserMsg, "");
}
=20
@@ -2921,8 +2921,8 @@
VG_(message)(Vg_UserMsg, "");
}
VG_(ctime)(buf);
- VG_(message)(Vg_UserMsg, "<status> <what>FINISHED</what> "
- "<when>%t</when> </status>", buf);
+ VG_(message)(Vg_UserMsg, "<status> <state>FINISHED</state> "
+ "<time>%t</time> </status>", buf);
VG_(message)(Vg_UserMsg, "");
}
=20
Modified: trunk/docs/internals/xml-output.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/docs/internals/xml-output.txt 2005-07-24 07:23:54 UTC (rev 4239=
)
+++ trunk/docs/internals/xml-output.txt 2005-07-24 07:33:15 UTC (rev 4240=
)
@@ -166,8 +166,8 @@
=20
* The following, indicating that the program has now started:
=20
- <status> <what>RUNNING</what>=20
- <when>human-readable-time-string</when>=20
+ <status> <state>RUNNING</state>=20
+ <time>human-readable-time-string</time>=20
</status>
=20
* Zero or more of (either ERROR or ERRORCOUNTS).
@@ -175,8 +175,8 @@
* The following, indicating that the program has now finished, and
that the wrapup (leak checking) is happening.
=20
- <status> <what>FINISHED</what>=20
- <when>human-readable-time-string</when>=20
+ <status> <state>FINISHED</state>=20
+ <time>human-readable-time-string</time>=20
</status>
=20
* SUPPCOUNTS, indicating how many times each suppression was used.
Modified: trunk/memcheck/tests/filter_xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/memcheck/tests/filter_xml 2005-07-24 07:23:54 UTC (rev 4239)
+++ trunk/memcheck/tests/filter_xml 2005-07-24 07:33:15 UTC (rev 4240)
@@ -9,7 +9,7 @@
sed "s/<dir>.*<\/dir>/<dir>...<\/dir>/" |
sed "s/<count>.*<\/count>/<count>...<\/count>/" |
perl -0 -p -e "s/<suppcounts>.*<\/suppcounts>/<suppcounts>...<\/suppcoun=
ts>/s" |
-perl -p -e "s/<when>.*<\/when>/<when>...<\/when>/s" |
+perl -p -e "s/<time>.*<\/time>/<time>...<\/time>/s" |
perl -0 -p -e "s/<vargv>.*<\/vargv>/<vargv>...<\/vargv>/s"
=20
# Collected wisdom re Perl magic incantation:
Modified: trunk/memcheck/tests/xml1.stderr.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/memcheck/tests/xml1.stderr.exp 2005-07-24 07:23:54 UTC (rev 423=
9)
+++ trunk/memcheck/tests/xml1.stderr.exp 2005-07-24 07:33:15 UTC (rev 424=
0)
@@ -24,7 +24,7 @@
</argv>
</args>
=20
-<status> <what>RUNNING</what> <when>...</when> </status>
+<status> <state>RUNNING</state> <time>...</time> </status>
=20
<error>
<unique>0x........</unique>
@@ -369,7 +369,7 @@
<pair> <count>...</count> <unique>0x........</unique> </pair>
</errorcounts>
=20
-<status> <what>FINISHED</what> <when>...</when> </status>
+<status> <state>FINISHED</state> <time>...</time> </status>
=20
<suppcounts>...</suppcounts>
=20
Modified: trunk/memcheck/tests/xml1.stderr.exp2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/memcheck/tests/xml1.stderr.exp2 2005-07-24 07:23:54 UTC (rev 42=
39)
+++ trunk/memcheck/tests/xml1.stderr.exp2 2005-07-24 07:33:15 UTC (rev 42=
40)
@@ -24,7 +24,7 @@
</argv>
</args>
=20
-<status> <what>RUNNING</what> <when>...</when> </status>
+<status> <state>RUNNING</state> <time>...</time> </status>
=20
<error>
<unique>0x........</unique>
@@ -366,7 +366,7 @@
<pair> <count>...</count> <unique>0x........</unique> </pair>
</errorcounts>
=20
-<status> <what>FINISHED</what> <when>...</when> </status>
+<status> <state>FINISHED</state> <time>...</time> </status>
=20
<suppcounts>...</suppcounts>
=20
Modified: trunk/memcheck/tests/xml1.stderr.exp64
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/memcheck/tests/xml1.stderr.exp64 2005-07-24 07:23:54 UTC (rev 4=
239)
+++ trunk/memcheck/tests/xml1.stderr.exp64 2005-07-24 07:33:15 UTC (rev 4=
240)
@@ -24,7 +24,7 @@
</argv>
</args>
=20
-<status> <what>RUNNING</what> <when>...</when> </status>
+<status> <state>RUNNING</state> <time>...</time> </status>
=20
<error>
<unique>0x........</unique>
@@ -374,7 +374,7 @@
<pair> <count>...</count> <unique>0x........</unique> </pair>
</errorcounts>
=20
-<status> <what>FINISHED</what> <when>...</when> </status>
+<status> <state>FINISHED</state> <time>...</time> </status>
=20
<suppcounts>...</suppcounts>
=20
|