Fix up xml1 on 32-bit machines; merged the 32 and 64-bit outputs by

extending the filter.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10494
This commit is contained in:
Nicholas Nethercote 2009-07-21 04:51:55 +00:00
parent 61a9677f7b
commit 7b5d892035
4 changed files with 4 additions and 434 deletions

View File

@ -180,8 +180,7 @@ EXTRA_DIST = \
wrap8.vgtest wrap8.stdout.exp wrap8.stderr.exp \
wrap8.stdout.exp2 wrap8.stderr.exp2 \
writev.stderr.exp writev.vgtest \
xml1.stderr.exp32 xml1.stderr.exp64 xml1.stdout.exp \
xml1.vgtest
xml1.stderr.exp xml1.stdout.exp xml1.vgtest
check_PROGRAMS = \
addressable \

View File

@ -8,6 +8,7 @@ sed "s/<obj>.*<\/obj>/<obj>...<\/obj>/" |
sed "s/<line>.*<\/line>/<line>...<\/line>/" |
sed "s/<dir>.*<\/dir>/<dir>...<\/dir>/" |
sed "s/<count>.*<\/count>/<count>...<\/count>/" |
sed "s/of size [48]</of size N</" |
perl -p -e "s/(m_replacemalloc\/)?vg_replace_malloc.c/vg_replace_malloc.c/" |
perl -0 -p -e "s/<suppcounts>.*<\/suppcounts>/<suppcounts>...<\/suppcounts>/s" |
perl -p -e "s/<time>.*<\/time>/<time>...<\/time>/s" |

View File

@ -31,7 +31,7 @@
<unique>0x........</unique>
<tid>...</tid>
<kind>InvalidRead</kind>
<what>Invalid read of size 4</what>
<what>Invalid read of size N</what>
<stack>
<frame>
<ip>0x........</ip>
@ -156,7 +156,7 @@
<unique>0x........</unique>
<tid>...</tid>
<kind>UninitValue</kind>
<what>Use of uninitialised value of size 8</what>
<what>Use of uninitialised value of size N</what>
<stack>
<frame>
<ip>0x........</ip>

View File

@ -1,430 +0,0 @@
<?xml version="1.0"?>
<valgrindoutput>
<protocolversion>3</protocolversion>
<preamble>
<line>...</line>
<line>...</line>
<line>...</line>
</preamble>
<pid>...</pid>
<ppid>...</ppid>
<tool>memcheck</tool>
<args>
<vargv>...</vargv>
<argv>
<exe>./xml1</exe>
</argv>
</args>
<status>
<state>RUNNING</state>
<time>...</time>
</status>
<error>
<unique>0x........</unique>
<tid>...</tid>
<kind>InvalidRead</kind>
<what>Invalid read of size 4</what>
<stack>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame3</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame2</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame1</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>main</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
</stack>
<auxwhat>Address 0x........ is 0 bytes after a block of size 40 alloc'd</auxwhat>
<stack>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>malloc</fn>
<dir>...</dir>
<file>vg_replace_malloc.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame3</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame2</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame1</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>main</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
</stack>
</error>
<error>
<unique>0x........</unique>
<tid>...</tid>
<kind>UninitCondition</kind>
<what>Conditional jump or move depends on uninitialised value(s)</what>
<stack>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame3</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame2</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame1</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>main</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
</stack>
</error>
<error>
<unique>0x........</unique>
<tid>...</tid>
<kind>UninitValue</kind>
<what>Use of uninitialised value of size 4</what>
<stack>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame3</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame2</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame1</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>main</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
</stack>
</error>
<error>
<unique>0x........</unique>
<tid>...</tid>
<kind>InvalidFree</kind>
<what>Invalid free() / delete / delete[]</what>
<stack>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>free</fn>
<dir>...</dir>
<file>vg_replace_malloc.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame3</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame2</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame1</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>main</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
</stack>
<auxwhat>Address 0x........ is 0 bytes inside a block of size 40 free'd</auxwhat>
<stack>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>free</fn>
<dir>...</dir>
<file>vg_replace_malloc.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame3</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame2</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame1</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>main</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
</stack>
</error>
<error>
<unique>0x........</unique>
<tid>...</tid>
<kind>InvalidFree</kind>
<what>Invalid free() / delete / delete[]</what>
<stack>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>free</fn>
<dir>...</dir>
<file>vg_replace_malloc.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame3</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame2</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame1</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>main</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
</stack>
<auxwhat>Address 0x........ is on thread 1's stack</auxwhat>
</error>
<error>
<unique>0x........</unique>
<tid>...</tid>
<kind>SyscallParam</kind>
<what>Syscall param exit(status) contains uninitialised byte(s)</what>
</error>
<errorcounts>
<pair>
<count>...</count>
<unique>0x........</unique>
</pair>
<pair>
<count>...</count>
<unique>0x........</unique>
</pair>
<pair>
<count>...</count>
<unique>0x........</unique>
</pair>
<pair>
<count>...</count>
<unique>0x........</unique>
</pair>
<pair>
<count>...</count>
<unique>0x........</unique>
</pair>
<pair>
<count>...</count>
<unique>0x........</unique>
</pair>
</errorcounts>
<status>
<state>FINISHED</state>
<time>...</time>
</status>
<suppcounts>...</suppcounts>
<error>
<unique>0x........</unique>
<tid>...</tid>
<kind>Leak_DefinitelyLost</kind>
<what>396 bytes in 1 blocks are definitely lost in loss record ... of ...</what>
<leakedbytes>396</leakedbytes>
<leakedblocks>1</leakedblocks>
<stack>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>malloc</fn>
<dir>...</dir>
<file>vg_replace_malloc.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame3</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame2</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>frame1</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
<frame>
<ip>0x........</ip>
<obj>...</obj>
<fn>main</fn>
<dir>...</dir>
<file>xml1.c</file>
<line>...</line>
</frame>
</stack>
</error>
</valgrindoutput>