Fix broken tests.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4207

diff --git a/memcheck/tests/filter_xml b/memcheck/tests/filter_xml
index 8a857c6146f06ac7431288864d3358333a99c198..f9c566985908c94949ecaeb0c8d432eea738ec43 100755 (executable)
--- a/memcheck/tests/filter_xml
+++ b/memcheck/tests/filter_xml
@@ -8,7 +8,9 @@ sed "s/<obj>.*<\/obj>/<obj>...<\/obj>/" |
 sed "s/<line>.*<\/line>/<line>...<\/line>/" |
 sed "s/<dir>.*<\/dir>/<dir>...<\/dir>/" |
 sed "s/<count>.*<\/count>/<count>...<\/count>/" |
-perl -0 -p -e "s/<suppcounts>.*<\/suppcounts>/<suppcounts>...<\/suppcounts>/s"
+perl -0 -p -e "s/<suppcounts>.*<\/suppcounts>/<suppcounts>...<\/suppcounts>/s" |
+perl    -p -e "s/<when>.*<\/when>/<when>...<\/when>/s" |
+perl -0 -p -e "s/<vargv>.*<\/vargv>/<vargv>...<\/vargv>/s"
 
 # Collected wisdom re Perl magic incantation:
 #

diff --git a/memcheck/tests/xml1.stderr.exp b/memcheck/tests/xml1.stderr.exp
index 0c8208dc071def94fddd15f8d8654f414890be0c..65e78c3b393a0457339ad7d3805e839b62b7f344 100644 (file)
--- a/memcheck/tests/xml1.stderr.exp
+++ b/memcheck/tests/xml1.stderr.exp
@@ -17,11 +17,14 @@
 <ppid>...</ppid>
 <tool>memcheck</tool>
 
-<argv>
-  <exe>./xml1</exe>
-</argv>
+<args>
+  <vargv>...</vargv>
+  <argv>
+    <exe>./xml1</exe>
+  </argv>
+</args>
 
-<status>RUNNING</status>
+<status> <what>RUNNING</what> <when>...</when> </status>
 
 <error>
   <unique>0x........</unique>
@@ -366,7 +369,7 @@
   <pair> <count>...</count> <unique>0x........</unique> </pair>
 </errorcounts>
 
-<status>FINISHED</status>
+<status> <what>FINISHED</what> <when>...</when> </status>
 
 <suppcounts>...</suppcounts>
 

diff --git a/memcheck/tests/xml1.stderr.exp2 b/memcheck/tests/xml1.stderr.exp2
index 4b7ee398d24201f86c19479d5339157f330fda64..271e8d35dc56510769cfb698d093447a6f87aa79 100644 (file)
--- a/memcheck/tests/xml1.stderr.exp2
+++ b/memcheck/tests/xml1.stderr.exp2
@@ -17,11 +17,14 @@
 <ppid>...</ppid>
 <tool>memcheck</tool>
 
-<argv>
-  <exe>./xml1</exe>
-</argv>
+<args>
+  <vargv>...</vargv>
+  <argv>
+    <exe>./xml1</exe>
+  </argv>
+</args>
 
-<status>RUNNING</status>
+<status> <what>RUNNING</what> <when>...</when> </status>
 
 <error>
   <unique>0x........</unique>
@@ -363,7 +366,7 @@
   <pair> <count>...</count> <unique>0x........</unique> </pair>
 </errorcounts>
 
-<status>FINISHED</status>
+<status> <what>FINISHED</what> <when>...</when> </status>
 
 <suppcounts>...</suppcounts>
 

diff --git a/memcheck/tests/xml1.stderr.exp64 b/memcheck/tests/xml1.stderr.exp64
index 6904c50e4b290b80a05db06e52a098bfbc49c29e..92f400106ecbe10437f2208b3a844233f64c59e4 100644 (file)
--- a/memcheck/tests/xml1.stderr.exp64
+++ b/memcheck/tests/xml1.stderr.exp64
@@ -17,11 +17,14 @@
 <ppid>...</ppid>
 <tool>memcheck</tool>
 
-<argv>
-  <exe>./xml1</exe>
-</argv>
+<args>
+  <vargv>...</vargv>
+  <argv>
+    <exe>./xml1</exe>
+  </argv>
+</args>
 
-<status>RUNNING</status>
+<status> <what>RUNNING</what> <when>...</when> </status>
 
 <error>
   <unique>0x........</unique>
@@ -371,7 +374,7 @@
   <pair> <count>...</count> <unique>0x........</unique> </pair>
 </errorcounts>
 
-<status>FINISHED</status>
+<status> <what>FINISHED</what> <when>...</when> </status>
 
 <suppcounts>...</suppcounts>
 

diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index 438013ced5a530fc287c3aecee0e025875fa52a6..8805661c250a022768057f164f6f2ed8c7a918a6 100644 (file)
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -7,7 +7,6 @@ usage: valgrind --tool=<toolname> [options] prog-and-args
     --version                 show version
     -q --quiet                run silently; only print error msgs
     -v --verbose              be more verbose, incl counts of errors
-    --xml=yes                 all output is in XML (Memcheck only)
     --trace-children=no|yes   Valgrind-ise child processes? [no]
     --track-fds=no|yes        track open file descriptors? [no]
     --time-stamp=no|yes       add timestamps to log messages? [no]
@@ -22,9 +21,12 @@ usage: valgrind --tool=<toolname> [options] prog-and-args
                               none, for code found in stacks, or all [stack]
 
   user options for Valgrind tools that report errors:
+    --xml=yes                 all output is in XML (Memcheck only)
+    --xml-user-comment=STR    copy STR verbatim to XML output
     --log-fd=<number>         log messages to file descriptor [2=stderr]
     --log-file=<file>         log messages to <file>.pid<pid>
     --log-file-exactly=<file> log messages to <file>
+    --log-file-qualifier=<VAR> incorporate $VAR in logfile name [none]
     --log-socket=ipaddr:port  log messages to socket ipaddr:port
     --demangle=no|yes         automatically demangle C++ names? [yes]
     --num-callers=<number>    show <num> callers in stack traces [12]

diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index ebcf2505943ccedeba0376dd1880d4e8f9d341e7..7c7d9e421aa8682abc273f3c245d71f74c4c3f15 100644 (file)
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -7,7 +7,6 @@ usage: valgrind --tool=<toolname> [options] prog-and-args
     --version                 show version
     -q --quiet                run silently; only print error msgs
     -v --verbose              be more verbose, incl counts of errors
-    --xml=yes                 all output is in XML (Memcheck only)
     --trace-children=no|yes   Valgrind-ise child processes? [no]
     --track-fds=no|yes        track open file descriptors? [no]
     --time-stamp=no|yes       add timestamps to log messages? [no]
@@ -22,9 +21,12 @@ usage: valgrind --tool=<toolname> [options] prog-and-args
                               none, for code found in stacks, or all [stack]
 
   user options for Valgrind tools that report errors:
+    --xml=yes                 all output is in XML (Memcheck only)
+    --xml-user-comment=STR    copy STR verbatim to XML output
     --log-fd=<number>         log messages to file descriptor [2=stderr]
     --log-file=<file>         log messages to <file>.pid<pid>
     --log-file-exactly=<file> log messages to <file>
+    --log-file-qualifier=<VAR> incorporate $VAR in logfile name [none]
     --log-socket=ipaddr:port  log messages to socket ipaddr:port
     --demangle=no|yes         automatically demangle C++ names? [yes]
     --num-callers=<number>    show <num> callers in stack traces [12]