From: Julian Seward Date: Sun, 26 Jun 2011 09:13:27 +0000 (+0000) Subject: GDB server: X-Git-Tag: svn/VALGRIND_3_7_0~402 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56896794047d836f04aec3ff529238916ff2111b;p=thirdparty%2Fvalgrind.git GDB server: * fix error in usability msg * make a test more deterministic (Philippe Waroquiers, philippe.waroquiers@skynet.be). Bug 214909 comment 107. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11835 --- diff --git a/coregrind/m_gdbserver/remote-utils.c b/coregrind/m_gdbserver/remote-utils.c index 66e4337634..1e822634b8 100644 --- a/coregrind/m_gdbserver/remote-utils.c +++ b/coregrind/m_gdbserver/remote-utils.c @@ -256,7 +256,7 @@ void remote_open (char *name) "or are doing some strange experiment):\n" " %s/../../bin/vgdb --pid=%d%s%s ...command...\n", VG_LIBDIR, - pid, (name_default ? "" : " --vgdb="), + pid, (name_default ? "" : " --vgdb-prefix="), (name_default ? "" : name)); } if (VG_(clo_verbosity) > 1 @@ -269,7 +269,7 @@ void remote_open (char *name) " target remote | %s/../../bin/vgdb --pid=%d%s%s\n", VG_(args_the_exename), VG_LIBDIR, - pid, (name_default ? "" : " --vgdb="), + pid, (name_default ? "" : " --vgdb-prefix="), (name_default ? "" : name) ); VG_(umsg)("--pid is optional if only one valgrind process is running\n"); diff --git a/gdbserver_tests/clean_after_fork.c b/gdbserver_tests/clean_after_fork.c index b8a7037fd0..6b9aa15d35 100644 --- a/gdbserver_tests/clean_after_fork.c +++ b/gdbserver_tests/clean_after_fork.c @@ -14,6 +14,8 @@ int main() } if (pid == 0) { + int burn; + for (burn = 0; burn < 100000; burn++) /* burncpu */__asm__ __volatile("":::"memory") ; if (mem == 0) exit(0); else diff --git a/gdbserver_tests/mcclean_after_fork.stderr.exp b/gdbserver_tests/mcclean_after_fork.stderr.exp index fcece50d6b..8c9826a45c 100644 --- a/gdbserver_tests/mcclean_after_fork.stderr.exp +++ b/gdbserver_tests/mcclean_after_fork.stderr.exp @@ -3,6 +3,8 @@ + + HEAP SUMMARY: in use at exit: 0 bytes in 0 blocks total heap usage: 0 allocs, 0 frees, 0 bytes allocated diff --git a/gdbserver_tests/mcclean_after_fork.stdinB.gdb b/gdbserver_tests/mcclean_after_fork.stdinB.gdb index f91ca9e68b..500ef8e41a 100644 --- a/gdbserver_tests/mcclean_after_fork.stdinB.gdb +++ b/gdbserver_tests/mcclean_after_fork.stdinB.gdb @@ -7,8 +7,8 @@ monitor vg.set vgdb-error 999999 # also put breaks in code that only the child will execute. # These breaks should not be encountered. break clean_after_fork.c:9 -break clean_after_fork.c:18 break clean_after_fork.c:20 +break clean_after_fork.c:22 # continue # first break encountered. diff --git a/gdbserver_tests/mcclean_after_fork.stdoutB.exp b/gdbserver_tests/mcclean_after_fork.stdoutB.exp index 6db3d3a2d5..590e4c93b9 100644 --- a/gdbserver_tests/mcclean_after_fork.stdoutB.exp +++ b/gdbserver_tests/mcclean_after_fork.stdoutB.exp @@ -1,6 +1,6 @@ Breakpoint 1 at 0x........: file clean_after_fork.c, line 9. -Breakpoint 2 at 0x........: file clean_after_fork.c, line 18. -Breakpoint 3 at 0x........: file clean_after_fork.c, line 20. +Breakpoint 2 at 0x........: file clean_after_fork.c, line 20. +Breakpoint 3 at 0x........: file clean_after_fork.c, line 22. Continuing. Breakpoint 1, main () at clean_after_fork.c:9 9 pid = fork(); @@ -8,5 +8,5 @@ Hardware read watchpoint 4: mem Continuing. Hardware read watchpoint 4: mem Value = 0 -main () at clean_after_fork.c:32 -32 if (mem == 0) +main () at clean_after_fork.c:34 +34 if (mem == 0)