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 788f6e3f5d0f827621595da5b57a01419abb4f56..530765c3dabda8480f8bb5de91d95658b9bc56a5 100644 (file)
--- 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"
            }
        }