Ensure gdbserver tests work with a recent git version of GDB

Tested with GDB 12, 13, 14 and 15.0.50.20240414

diff --git a/gdbserver_tests/mcbreak.stdoutB.exp b/gdbserver_tests/mcbreak.stdoutB.exp
index 75590375d027aeb0ded9db71e71de215da4f0184..440d5ff3ce1f98b7abe0af7ec84de844e5bd9585 100644 (file)
--- a/gdbserver_tests/mcbreak.stdoutB.exp
+++ b/gdbserver_tests/mcbreak.stdoutB.exp
@@ -40,7 +40,7 @@ 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]
+Delete all breakpoints, watchpoints, tracepoints, and catchpoints? (y or n) [answered Y; input not from terminal]
 Continuing.
 Program received signal SIGTRAP, Trace/breakpoint trap.
 make_error (s=0x........ "called from level") at t.c:41

diff --git a/gdbserver_tests/mcinfcallWSRU.stderrB.exp b/gdbserver_tests/mcinfcallWSRU.stderrB.exp
index 50a2adb5924ea4e4fe9ffc15e2d78b2b9fe04f93..9e0c35d41d2edffd7019a90cb388b4d16b7e6d82 100644 (file)
--- a/gdbserver_tests/mcinfcallWSRU.stderrB.exp
+++ b/gdbserver_tests/mcinfcallWSRU.stderrB.exp
@@ -22,7 +22,7 @@ do_burn () at sleepers.c:40
 $1 = void
 [Switching to thread 2 (Thread ....)]
 #0  0x........ in syscall ...
-Could not write register  "xxx"; remote failure reply 'E.
+Could not write register  "xxx"; remote failure reply '
 ERROR changing register  xxx regno y
 gdb commands changing registers (pc, sp, ...) (e.g. 'jump',
 set pc, calling from gdb a function in the debugged process, ...)
@@ -31,7 +31,7 @@ Thread status is VgTs_WaitSys
 '
 [Switching to thread 3 (Thread ....)]
 #0  0x........ in syscall ...
-Could not write register  "xxx"; remote failure reply 'E.
+Could not write register  "xxx"; remote failure reply '
 ERROR changing register  xxx regno y
 gdb commands changing registers (pc, sp, ...) (e.g. 'jump',
 set pc, calling from gdb a function in the debugged process, ...)
@@ -40,7 +40,7 @@ Thread status is VgTs_WaitSys
 '
 [Switching to thread 4 (Thread ....)]
 #0  0x........ in syscall ...
-Could not write register  "xxx"; remote failure reply 'E.
+Could not write register  "xxx"; remote failure reply '
 ERROR changing register  xxx regno y
 gdb commands changing registers (pc, sp, ...) (e.g. 'jump',
 set pc, calling from gdb a function in the debugged process, ...)

diff --git a/gdbserver_tests/mcwatchpoints.stdoutB.exp b/gdbserver_tests/mcwatchpoints.stdoutB.exp
index 27cd8cbd3e586c3aa883b1ed147ca5a11ecb53c7..8772b5831f65b7c72e04c28dfcb5515127e76cee 100644 (file)
--- a/gdbserver_tests/mcwatchpoints.stdoutB.exp
+++ b/gdbserver_tests/mcwatchpoints.stdoutB.exp
@@ -30,7 +30,7 @@ Old value = 100 'd'
 New value = 68 'D'
 main (argc=1, argv=0x........) at watchpoints.c:49
 49        fprintf(stderr, "after writing 8\n");
-Delete all breakpoints? (y or n) [answered Y; input not from terminal]
+Delete all breakpoints, watchpoints, tracepoints, and catchpoints? (y or n) [answered Y; input not from terminal]
 Breakpoint 8 at 0x........: file watchpoints.c, line 70.
 Continuing.
 Breakpoint 8, main (argc=1, argv=0x........) at watchpoints.c:70