|
From: <sv...@va...> - 2005-06-15 21:34:42
|
Author: sewardj Date: 2005-06-15 22:34:35 +0100 (Wed, 15 Jun 2005) New Revision: 3915 Log: Update expected output. Modified: trunk/memcheck/tests/filter_xml trunk/memcheck/tests/xml1.stderr.exp 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-06-15 10:31:10 UTC (rev 3914) +++ trunk/memcheck/tests/filter_xml 2005-06-15 21:34:35 UTC (rev 3915) @@ -5,5 +5,5 @@ sed "s/<pid>[0-9]*<\/pid>/<pid>...<\/pid>/" | sed "s/<ppid>[0-9]*<\/ppid>/<ppid>...<\/ppid>/" | sed "s/<obj>.*<\/obj>/<obj>...<\/obj>/" | -sed "s/<preamble>.*<\/preamble>/<preamble>...<\/preamble>/" - +sed "s/<line>.*<\/line>/<line>...<\/line>/" | +sed "s/<dir>.*<\/dir>/<dir>...<\/dir>/" 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-06-15 10:31:10 UTC (rev 391= 4) +++ trunk/memcheck/tests/xml1.stderr.exp 2005-06-15 21:34:35 UTC (rev 391= 5) @@ -1,3 +1,4 @@ +<?xml version=3D"1.0"?> =20 <valgrindoutput> =20 @@ -3,10 +4,12 @@ <protocolversion>1</protocolversion> =20 -<preamble>...</preamble> -<preamble>...</preamble> -<preamble>...</preamble> -<preamble>...</preamble> -<preamble>...</preamble> -<preamble>...</preamble> +<preamble> + <line>...</line> + <line>...</line> + <line>...</line> + <line>...</line> + <line>...</line> + <line>...</line> +</preamble> =20 <pid>...</pid> @@ -15,7 +18,7 @@ <tool>memcheck</tool> =20 <argv> - <arg>./xml1</arg> + <exe>./xml1</exe> </argv> =20 <status>RUNNING</status> @@ -26,18 +29,81 @@ <kind>InvalidRead</kind> <what>Invalid read of size 4</what> <stack> - <frame><ip>0x........</ip><obj>...</obj><fn>frame3</fn><file>xml1.c<= /file><line>11</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>frame2</fn><file>xml1.c<= /file><line>39</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>frame1</fn><file>xml1.c<= /file><line>44</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>main</fn><file>xml1.c</f= ile><line>49</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 after a block of size 40 alloc'= d</auxwhat> <stack> - <frame><ip>0x........</ip><obj>...</obj><fn>malloc</fn><file>vg_repl= ace_malloc.c</file><line>220</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>frame3</fn><file>xml1.c<= /file><line>8</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>frame2</fn><file>xml1.c<= /file><line>39</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>frame1</fn><file>xml1.c<= /file><line>44</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>main</fn><file>xml1.c</f= ile><line>49</line></frame> + <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> =20 @@ -47,10 +113,38 @@ <kind>UninitCondition</kind> <what>Conditional jump or move depends on uninitialised value(s)</what= > <stack> - <frame><ip>0x........</ip><obj>...</obj><fn>frame3</fn><file>xml1.c<= /file><line>14</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>frame2</fn><file>xml1.c<= /file><line>39</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>frame1</fn><file>xml1.c<= /file><line>44</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>main</fn><file>xml1.c</f= ile><line>49</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> =20 @@ -60,10 +154,38 @@ <kind>UninitValue</kind> <what>Use of uninitialised value of size 4</what> <stack> - <frame><ip>0x........</ip><obj>...</obj><fn>frame3</fn><file>xml1.c<= /file><line>21</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>frame2</fn><file>xml1.c<= /file><line>39</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>frame1</fn><file>xml1.c<= /file><line>44</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>main</fn><file>xml1.c</f= ile><line>49</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> =20 @@ -73,19 +195,89 @@ <kind>InvalidFree</kind> <what>Invalid free() / delete / delete[]</what> <stack> - <frame><ip>0x........</ip><obj>...</obj><fn>free</fn><file>vg_replac= e_malloc.c</file><line>306</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>frame3</fn><file>xml1.c<= /file><line>25</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>frame2</fn><file>xml1.c<= /file><line>39</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>frame1</fn><file>xml1.c<= /file><line>44</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>main</fn><file>xml1.c</f= ile><line>49</line></frame> + <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><file>vg_replac= e_malloc.c</file><line>306</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>frame3</fn><file>xml1.c<= /file><line>24</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>frame2</fn><file>xml1.c<= /file><line>39</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>frame1</fn><file>xml1.c<= /file><line>44</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>main</fn><file>xml1.c</f= ile><line>49</line></frame> + <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> =20 @@ -95,11 +287,46 @@ <kind>InvalidFree</kind> <what>Invalid free() / delete / delete[]</what> <stack> - <frame><ip>0x........</ip><obj>...</obj><fn>free</fn><file>vg_replac= e_malloc.c</file><line>306</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>frame3</fn><file>xml1.c<= /file><line>28</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>frame2</fn><file>xml1.c<= /file><line>39</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>frame1</fn><file>xml1.c<= /file><line>44</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>main</fn><file>xml1.c</f= ile><line>49</line></frame> + <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> @@ -110,26 +337,43 @@ <kind>SyscallParam</kind> <what>Syscall param exit_group(exit_code) contains uninitialised byte(= s)</what> <stack> - <frame><ip>0x........</ip><obj>...</obj><fn>_Exit</fn></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>__libc_start_main</fn></= frame> - <frame><ip>0x........</ip><obj>...</obj><file>start.S</file><line>10= 2</line></frame> + <frame> + <ip>0x........</ip> + <obj>...</obj> + <fn>_Exit</fn> + </frame> + <frame> + <ip>0x........</ip> + <obj>...</obj> + <fn>__libc_start_main</fn> + </frame> + <frame> + <ip>0x........</ip> + <obj>...</obj> + <dir>...</dir> + <file>start.S</file> + <line>...</line> + </frame> </stack> </error> =20 <errorcounts> - <pair><count>1</count><unique>0x........</unique></pair> - <pair><count>1</count><unique>0x........</unique></pair> - <pair><count>1</count><unique>0x........</unique></pair> - <pair><count>1</count><unique>0x........</unique></pair> - <pair><count>1</count><unique>0x........</unique></pair> - <pair><count>1</count><unique>0x........</unique></pair> + <pair> <count>1</count> <unique>0x........</unique> </pair> + <pair> <count>1</count> <unique>0x........</unique> </pair> + <pair> <count>1</count> <unique>0x........</unique> </pair> + <pair> <count>1</count> <unique>0x........</unique> </pair> + <pair> <count>1</count> <unique>0x........</unique> </pair> + <pair> <count>1</count> <unique>0x........</unique> </pair> </errorcounts> =20 <status>FINISHED</status> =20 <suppcounts> - <pair><count>18</count><name>Ugly strchr error in /lib/ld-2.3.3.so</na= me></pair> -<suppcounts> + <pair> + <count>16</count> + <name>Ugly strchr error in /lib/ld-2.3.3.so</name> + </pair> +</suppcounts> =20 <error> <unique>0x........</unique> @@ -139,11 +383,46 @@ <leakedbytes>396</leakedbytes> <leakedblocks>1</leakedblocks> <stack> - <frame><ip>0x........</ip><obj>...</obj><fn>malloc</fn><file>vg_repl= ace_malloc.c</file><line>220</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>frame3</fn><file>xml1.c<= /file><line>31</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>frame2</fn><file>xml1.c<= /file><line>39</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>frame1</fn><file>xml1.c<= /file><line>44</line></frame> - <frame><ip>0x........</ip><obj>...</obj><fn>main</fn><file>xml1.c</f= ile><line>49</line></frame> + <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> =20 |