From: Philippe Waroquiers <philippe.waroquiers@skynet.be>
Date: Sun, 20 Nov 2022 23:14:38 +0000 (+0100)
Subject: Fix step-over-syscall.exp matching regexp for $bpnum.$locno matching
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e66c9edea34ce13e7a6769996e1d151505d8cd3e;p=binutils-gdb.git

Fix step-over-syscall.exp matching regexp for $bpnum.$locno matching

step-over-syscall.exp has some specific tests for gdbserver.
The regexp matching breakpoint hit must take the added locno into account.

Test re-run in 3 modes (normal, native-gdbserver and native-extended-gdbserver).
---

diff --git a/gdb/testsuite/gdb.base/step-over-syscall.exp b/gdb/testsuite/gdb.base/step-over-syscall.exp
index 788f6e3f5d0..530765c3dab 100644
--- a/gdb/testsuite/gdb.base/step-over-syscall.exp
+++ b/gdb/testsuite/gdb.base/step-over-syscall.exp
@@ -368,12 +368,12 @@ proc break_cond_on_syscall { syscall follow_fork detach_on_fork } {
 		if { $detach_on_fork == "off" } {
 		    gdb_test "inferior 1"
 		    gdb_test "break marker" "Breakpoint.*at.*"
-		    gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, marker \\(\\) at.*" \
+		    gdb_test "continue" "Continuing\\..*Breakpoint $::bkptno_numopt_re, marker \\(\\) at.*" \
 			"continue to marker"
 		}
 	    } else {
 		gdb_test "break marker" "Breakpoint.*at.* file .*${testfile}.c, line.*"
-		gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, marker \\(\\) at.*" \
+		gdb_test "continue" "Continuing\\..*Breakpoint $::bkptno_numopt_re, marker \\(\\) at.*" \
 		    "continue to marker"
 	    }
 	}