|
From: <sv...@va...> - 2013-06-02 03:00:44
|
petarj 2013-06-02 03:59:07 +0100 (Sun, 02 Jun 2013)
New Revision: 13414
Log:
add and update exp files for drd/tests/annotate_trace_memory
exp-32bit files needed minor update for the last store, and some mips32
platforms also need additional exp-mips32 due to different way of loading
and storing double values.
This fixes drd/tests/annotate_trace_memory on different 32-bit platforms.
Added files:
trunk/drd/tests/annotate_trace_memory.stderr.exp-mips32
trunk/drd/tests/annotate_trace_memory_xml.stderr.exp-mips32
Modified files:
trunk/drd/tests/Makefile.am
trunk/drd/tests/annotate_trace_memory.stderr.exp-32bit
trunk/drd/tests/annotate_trace_memory_xml.stderr.exp-32bit
Added: trunk/drd/tests/annotate_trace_memory_xml.stderr.exp-mips32 (+338 -0)
===================================================================
--- trunk/drd/tests/annotate_trace_memory_xml.stderr.exp-mips32 2013-05-31 16:44:06 +01:00 (rev 13413)
+++ trunk/drd/tests/annotate_trace_memory_xml.stderr.exp-mips32 2013-06-02 03:59:07 +01:00 (rev 13414)
@@ -0,0 +1,338 @@
+<?xml version="1.0"?>
+
+<valgrindoutput>
+
+<protocolversion>4</protocolversion>
+<protocoltool>drd</protocoltool>
+
+<preamble>
+ <line>...</line>
+ <line>...</line>
+ <line>...</line>
+ <line>...</line>
+</preamble>
+
+<pid>...</pid>
+<ppid>...</ppid>
+<tool>drd</tool>
+
+<args>
+ <vargv>...</vargv>
+ <argv>
+ <exe>./annotate_trace_memory</exe>
+ </argv>
+</args>
+
+<status>
+ <state>RUNNING</state>
+ <time>...</time>
+</status>
+
+float
+ <trace><text>store 0x........ size 4 val 1065353216/0x........ (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+ <trace><text>load 0x........ size 4 (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+ <trace><text>store 0x........ size 4 val 1077936128/0x........ (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+double
+ <trace><text>store 0x........ size 4 val 0/0x........ (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+ <trace><text>store 0x........ size 4 val 1074266112/0x........ (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+ <trace><text>load 0x........ size 4 (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+ <trace><text>load 0x........ size 4 (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+ <trace><text>store 0x........ size 4 val 0/0x........ (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+ <trace><text>store 0x........ size 4 val 1075576832/0x........ (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+uint8_t
+ <trace><text>store 0x........ size 1 val 5/0x........ (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+ <trace><text>load 0x........ size 1 (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+ <trace><text>store 0x........ size 1 val 11/0x........ (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+uint16_t
+ <trace><text>store 0x........ size 2 val 7/0x........ (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+ <trace><text>load 0x........ size 2 (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+ <trace><text>store 0x........ size 2 val 8/0x........ (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+uint32_t
+ <trace><text>store 0x........ size 4 val 8/0x........ (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+ <trace><text>load 0x........ size 4 (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+ <trace><text>store 0x........ size 4 val 9/0x........ (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+uint64_t
+ <trace><text>store 0x........ size 4 val 9/0x........ (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+ <trace><text>store 0x........ size 4 val 0/0x........ (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+ <trace><text>load 0x........ size 4 (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+ <trace><text>load 0x........ size 4 (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+ <trace><text>store 0x........ size 4 val 305419905/0x........ (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+ <trace><text>store 0x........ size 4 val 0/0x........ (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
+Done.
+
+<status>
+ <state>FINISHED</state>
+ <time>...</time>
+</status>
+
+<errorcounts>
+</errorcounts>
+
+<suppcounts>...</suppcounts>
+
+</valgrindoutput>
+
Added: trunk/drd/tests/annotate_trace_memory.stderr.exp-mips32 (+58 -0)
===================================================================
--- trunk/drd/tests/annotate_trace_memory.stderr.exp-mips32 2013-05-31 16:44:06 +01:00 (rev 13413)
+++ trunk/drd/tests/annotate_trace_memory.stderr.exp-mips32 2013-06-02 03:59:07 +01:00 (rev 13414)
@@ -0,0 +1,58 @@
+
+float
+store 0x........ size 4 val 1065353216/0x........ (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+load 0x........ size 4 (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+store 0x........ size 4 val 1077936128/0x........ (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+double
+store 0x........ size 4 val 0/0x........ (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+store 0x........ size 4 val 1074266112/0x........ (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+load 0x........ size 4 (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+load 0x........ size 4 (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+store 0x........ size 4 val 0/0x........ (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+store 0x........ size 4 val 1075576832/0x........ (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+uint8_t
+store 0x........ size 1 val 5/0x........ (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+load 0x........ size 1 (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+store 0x........ size 1 val 11/0x........ (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+uint16_t
+store 0x........ size 2 val 7/0x........ (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+load 0x........ size 2 (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+store 0x........ size 2 val 8/0x........ (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+uint32_t
+store 0x........ size 4 val 8/0x........ (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+load 0x........ size 4 (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+store 0x........ size 4 val 9/0x........ (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+uint64_t
+store 0x........ size 4 val 9/0x........ (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+store 0x........ size 4 val 0/0x........ (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+load 0x........ size 4 (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+load 0x........ size 4 (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+store 0x........ size 4 val 305419905/0x........ (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+store 0x........ size 4 val 0/0x........ (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
+Done.
+
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
Modified: trunk/drd/tests/annotate_trace_memory_xml.stderr.exp-32bit (+12 -0)
===================================================================
--- trunk/drd/tests/annotate_trace_memory_xml.stderr.exp-32bit 2013-05-31 16:44:06 +01:00 (rev 13413)
+++ trunk/drd/tests/annotate_trace_memory_xml.stderr.exp-32bit 2013-06-02 03:59:07 +01:00 (rev 13414)
@@ -274,6 +274,18 @@
</frame>
</stack>
</trace>
+ <trace><text>store 0x........ size 4 val 0/0x........ (thread x / vc ...)</text>
+ <stack>
+ <frame>
+ <ip>0x........</ip>
+ <obj>...</obj>
+ <fn>main</fn>
+ <dir>...</dir>
+ <file>annotate_trace_memory.c</file>
+ <line>...</line>
+ </frame>
+ </stack>
+ </trace>
Done.
<status>
Modified: trunk/drd/tests/Makefile.am (+2 -0)
===================================================================
--- trunk/drd/tests/Makefile.am 2013-05-31 16:44:06 +01:00 (rev 13413)
+++ trunk/drd/tests/Makefile.am 2013-06-02 03:59:07 +01:00 (rev 13414)
@@ -61,9 +61,11 @@
annotate_ignore_write2.vgtest \
annotate_trace_memory.stderr.exp-32bit \
annotate_trace_memory.stderr.exp-64bit \
+ annotate_trace_memory.stderr.exp-mips32 \
annotate_trace_memory.vgtest \
annotate_trace_memory_xml.stderr.exp-32bit \
annotate_trace_memory_xml.stderr.exp-64bit \
+ annotate_trace_memory_xml.stderr.exp-mips32 \
annotate_trace_memory_xml.vgtest \
annotate_static.stderr.exp \
annotate_static.vgtest \
Modified: trunk/drd/tests/annotate_trace_memory.stderr.exp-32bit (+2 -0)
===================================================================
--- trunk/drd/tests/annotate_trace_memory.stderr.exp-32bit 2013-05-31 16:44:06 +01:00 (rev 13413)
+++ trunk/drd/tests/annotate_trace_memory.stderr.exp-32bit 2013-06-02 03:59:07 +01:00 (rev 13414)
@@ -45,6 +45,8 @@
at 0x........: main (annotate_trace_memory.c:?)
store 0x........ size 4 val 305419905/0x........ (thread x / vc ...)
at 0x........: main (annotate_trace_memory.c:?)
+store 0x........ size 4 val 0/0x........ (thread x / vc ...)
+ at 0x........: main (annotate_trace_memory.c:?)
Done.
ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
|