Merge none/ changes from branches/MESSAGING_TIDYUP r10464.

See trunk r10465 commit message for details.

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

diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index 4d30986a037180f60fc449e2f2ab15aebc263a1b..5639e388802c30468b1a5af2a2e46a586dd0d6df 100644 (file)
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -29,8 +29,11 @@ usage: valgrind [options] prog-and-args
                               tools that make use of it (Memcheck, Helgrind)
 
   user options for Valgrind tools that report errors:
-    --xml=yes                 all output is in XML (some tools only)
-    --xml-user-comment=STR    copy STR verbatim to XML output
+    --xml=yes                 emit error output in XML (some tools only)
+    --xml-fd=<number>         XML output to file descriptor
+    --xml-file=<file>         XML output to <file>
+    --xml-socket=ipaddr:port  XML output to socket ipaddr:port
+    --xml-user-comment=STR    copy STR verbatim into XML output
     --demangle=no|yes         automatically demangle C++ names? [yes]
     --num-callers=<number>    show <number> callers in stack traces [12]
     --error-limit=no|yes      stop showing new errors if too many? [yes]

diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index 60d81cb22d33f9ad2d3fbd62eb69c48330e727b9..a856f8e27fdd921f0f6d63c42e61b0cd1efd9b42 100644 (file)
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -29,8 +29,11 @@ usage: valgrind [options] prog-and-args
                               tools that make use of it (Memcheck, Helgrind)
 
   user options for Valgrind tools that report errors:
-    --xml=yes                 all output is in XML (some tools only)
-    --xml-user-comment=STR    copy STR verbatim to XML output
+    --xml=yes                 emit error output in XML (some tools only)
+    --xml-fd=<number>         XML output to file descriptor
+    --xml-file=<file>         XML output to <file>
+    --xml-socket=ipaddr:port  XML output to socket ipaddr:port
+    --xml-user-comment=STR    copy STR verbatim into XML output
     --demangle=no|yes         automatically demangle C++ names? [yes]
     --num-callers=<number>    show <number> callers in stack traces [12]
     --error-limit=no|yes      stop showing new errors if too many? [yes]

diff --git a/none/tests/vgprintf.c b/none/tests/vgprintf.c
index 0a023fb53229472c1c65aefe59eda239845f10fa..10ebcb426b614b2b5b76cf9318d118b8617f9681 100644 (file)
--- a/none/tests/vgprintf.c
+++ b/none/tests/vgprintf.c
@@ -4,7 +4,7 @@
 int
 main (int argc, char **argv)
 {
-   int x = VALGRIND_PRINTF("Yo");
+   int x = VALGRIND_PRINTF("Yo\n");
    printf ("%d\n", x);
    return 0;
 }