From f54726edbb5a60019a64f0f974376339fa4bf7b0 Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Wed, 15 Jul 2009 14:52:02 +0000 Subject: [PATCH] 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 --- none/tests/cmdline1.stdout.exp | 7 +++++-- none/tests/cmdline2.stdout.exp | 7 +++++-- none/tests/vgprintf.c | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp index 4d30986a0..5639e3888 100644 --- 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= XML output to file descriptor + --xml-file= XML output to + --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= show 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 60d81cb22..a856f8e27 100644 --- 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= XML output to file descriptor + --xml-file= XML output to + --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= show 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 0a023fb53..10ebcb426 100644 --- 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; }