|
From: <sv...@va...> - 2009-07-15 14:52:15
|
Author: sewardj
Date: 2009-07-15 15:52:02 +0100 (Wed, 15 Jul 2009)
New Revision: 10475
Log:
Merge none/ changes from branches/MESSAGING_TIDYUP r10464.
See trunk r10465 commit message for details.
Modified:
trunk/none/tests/cmdline1.stdout.exp
trunk/none/tests/cmdline2.stdout.exp
trunk/none/tests/linux/mremap.c
trunk/none/tests/linux/mremap.stderr.exp
trunk/none/tests/linux/mremap.stderr.exp-glibc27
trunk/none/tests/linux/mremap.stdout.exp
trunk/none/tests/linux/mremap.vgtest
trunk/none/tests/linux/mremap2.c
trunk/none/tests/linux/mremap2.stderr.exp
trunk/none/tests/linux/mremap2.stdout.exp
trunk/none/tests/linux/mremap2.stdout.exp-glibc28-amd64
trunk/none/tests/linux/mremap2.stdout.exp2
trunk/none/tests/linux/mremap2.vgtest
trunk/none/tests/vgprintf.c
trunk/none/tests/x86/cpuid_s.S
Modified: trunk/none/tests/cmdline1.stdout.exp
===================================================================
--- trunk/none/tests/cmdline1.stdout.exp 2009-07-15 14:51:48 UTC (rev 10474)
+++ trunk/none/tests/cmdline1.stdout.exp 2009-07-15 14:52:02 UTC (rev 10475)
@@ -29,8 +29,11 @@
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]
Modified: trunk/none/tests/cmdline2.stdout.exp
===================================================================
--- trunk/none/tests/cmdline2.stdout.exp 2009-07-15 14:51:48 UTC (rev 10474)
+++ trunk/none/tests/cmdline2.stdout.exp 2009-07-15 14:52:02 UTC (rev 10475)
@@ -29,8 +29,11 @@
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]
Property changes on: trunk/none/tests/linux/mremap.c
___________________________________________________________________
Name: svn:mergeinfo
-
Property changes on: trunk/none/tests/linux/mremap.stderr.exp
___________________________________________________________________
Name: svn:mergeinfo
-
Property changes on: trunk/none/tests/linux/mremap.stderr.exp-glibc27
___________________________________________________________________
Name: svn:mergeinfo
-
Property changes on: trunk/none/tests/linux/mremap.stdout.exp
___________________________________________________________________
Name: svn:mergeinfo
-
Property changes on: trunk/none/tests/linux/mremap.vgtest
___________________________________________________________________
Name: svn:mergeinfo
-
Property changes on: trunk/none/tests/linux/mremap2.c
___________________________________________________________________
Name: svn:mergeinfo
-
Property changes on: trunk/none/tests/linux/mremap2.stderr.exp
___________________________________________________________________
Name: svn:mergeinfo
-
Property changes on: trunk/none/tests/linux/mremap2.stdout.exp
___________________________________________________________________
Name: svn:mergeinfo
-
Property changes on: trunk/none/tests/linux/mremap2.stdout.exp-glibc28-amd64
___________________________________________________________________
Name: svn:mergeinfo
-
Property changes on: trunk/none/tests/linux/mremap2.stdout.exp2
___________________________________________________________________
Name: svn:mergeinfo
-
Property changes on: trunk/none/tests/linux/mremap2.vgtest
___________________________________________________________________
Name: svn:mergeinfo
-
Modified: trunk/none/tests/vgprintf.c
===================================================================
--- trunk/none/tests/vgprintf.c 2009-07-15 14:51:48 UTC (rev 10474)
+++ trunk/none/tests/vgprintf.c 2009-07-15 14:52:02 UTC (rev 10475)
@@ -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;
}
Property changes on: trunk/none/tests/x86/cpuid_s.S
___________________________________________________________________
Name: svn:mergeinfo
-
|