[PATCH/OBVIOUS] Add missing gdb_prompt in ctxobj.exp to avoid random failure, fix typo.

Message ID 20221119151308.255698-1-philippe.waroquiers@skynet.be
State New
Headers
Series [PATCH/OBVIOUS] Add missing gdb_prompt in ctxobj.exp to avoid random failure, fix typo. |

Commit Message

Philippe Waroquiers Nov. 19, 2022, 3:13 p.m. UTC
  ctxobj.exp fails randomly when computer is loaded.
With the addition of $gdb_prompt in the regexp testing for breakpoint hit,
I could not make it fail anymore.

Also fixed a typo in a comment.
---
 gdb/testsuite/gdb.base/ctxobj.exp | 4 ++--
 gdb/testsuite/lib/mi-support.exp  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
  

Patch

diff --git a/gdb/testsuite/gdb.base/ctxobj.exp b/gdb/testsuite/gdb.base/ctxobj.exp
index 3ca8111896c..228a6890f11 100644
--- a/gdb/testsuite/gdb.base/ctxobj.exp
+++ b/gdb/testsuite/gdb.base/ctxobj.exp
@@ -70,7 +70,7 @@  gdb_test "break ctxobj-f.c:$bp_location" \
 global expect_out
 set test "continue to get_version_1"
 gdb_test_multiple "continue" $test {
-    -re "Breakpoint ($bkptno_num_re), get_version_1 \\(\\).*" {
+    -re "Breakpoint ($bkptno_num_re), get_version_1 \\(\\).*\r\n.*$gdb_prompt $" {
 	set bpno $expect_out(1,string)
 	pass $test
     }
@@ -110,7 +110,7 @@  gdb_test "print this_version_num == v" \
 # Do the same, but from get_version_2.
 set test "continue to get_version_2"
 gdb_test_multiple "continue" $test {
-    -re "Breakpoint ($bkptno_num_re), get_version_2 \\(\\).*" {
+    -re "Breakpoint ($bkptno_num_re), get_version_2 \\(\\).*\r\n.*$gdb_prompt $" {
 	set bpno $expect_out(1,string)
 	pass $test
     }
diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index a45c6f7be28..14ddf0ad7ff 100644
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -1211,7 +1211,7 @@  proc mi_detect_async {} {
 # EXTRA can be a list of one, two or three elements.
 # The first element is the regular expression
 # for output expected right after *stopped, and before GDB prompt.
-# The third element is the regulation expression for the locno
+# The third element is the regular expression for the locno
 # right after bkptno field.  The locno regex should not include
 # the comma separating it from the following fields.
 #