From a57a0530329de8268d41cb95623adf345f19fac3 Mon Sep 17 00:00:00 2001 From: Philippe Waroquiers Date: Thu, 6 Aug 2015 16:42:12 +0000 Subject: [PATCH] Ensure gdbserver_tests/mcbreak.vgtest works with gcc 4.9 At least on x86+gcc4.9, the test fails because step+finish makes the program stop on the breakme call line (after the call) instead of reaching line 120. So; change the gdb commands so as to ensure we reach line 120 git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15504 --- gdbserver_tests/mcbreak.stdinB.gdb | 6 +++--- gdbserver_tests/mcbreak.stdoutB.exp | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/gdbserver_tests/mcbreak.stdinB.gdb b/gdbserver_tests/mcbreak.stdinB.gdb index 38285a7161..556da9e6c6 100644 --- a/gdbserver_tests/mcbreak.stdinB.gdb +++ b/gdbserver_tests/mcbreak.stdinB.gdb @@ -51,9 +51,9 @@ print sleeps=1 print whoami("after next: inferior call pushed from mcbreak.stdinB.gdb") continue # -# encountered second break -step -finish +# encountered second break. Ensure we stop on line 120 : if (argc > 1) +break 120 +continue # delete all breaks delete continue diff --git a/gdbserver_tests/mcbreak.stdoutB.exp b/gdbserver_tests/mcbreak.stdoutB.exp index c2e2e19957..ba526daca8 100644 --- a/gdbserver_tests/mcbreak.stdoutB.exp +++ b/gdbserver_tests/mcbreak.stdoutB.exp @@ -36,10 +36,9 @@ $14 = void Continuing. Breakpoint 2, main (argc=1, argv=0x........) at t.c:118 118 breakme(__LINE__); //break2 -breakme (line=118) at t.c:101 -101 if (line > 1000) -Run till exit from #0 breakme (line=118) at t.c:101 -main (argc=1, argv=0x........) at t.c:120 +Breakpoint 3 at 0x........: file t.c, line 120. +Continuing. +Breakpoint 3, main (argc=1, argv=0x........) at t.c:120 120 if (argc > 1) Delete all breakpoints? (y or n) [answered Y; input not from terminal] Continuing. -- 2.47.2