[binutils-gdb] Fix step-over-syscall.exp matching regexp for $bpnum.$locno matching

[binutils-gdb] Fix step-over-syscall.exp matching regexp for $bpnum.$locno matching

[Philippe Waroquiers]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=e66c9edea34ce13e7a6769996e1d151505d8cd3e

commit e66c9edea34ce13e7a6769996e1d151505d8cd3e
Author: Philippe Waroquiers <philippe.waroquiers@skynet.be>
Date:   Mon Nov 21 00:14:38 2022 +0100

    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:
---
 gdb/testsuite/gdb.base/step-over-syscall.exp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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"
 	    }
 	}