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

diff --git a/gdbserver_tests/mcbreak.stdinB.gdb b/gdbserver_tests/mcbreak.stdinB.gdb
index 38285a7161c7f7aa106857bc9f898ed765cfca8b..556da9e6c6bd17284a5ceb79c47b9dc432281308 100644 (file)
--- 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 c2e2e199574ec897302e6c88c4506a6670bbbcdd..ba526daca89c6bab98b90a0a02f484036a9429ed 100644 (file)
--- 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.