Re: [RFA] Fix step-over-syscall.exp matching regexp for $bpnum.$locno matching

[Simon Marchi <simark@simark.ca>]

On 11/20/22 18:36, Philippe Waroquiers via Gdb-patches wrote:
> 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).
> ---
>  gdb/testsuite/gdb.base/step-over-syscall.exp | 5 +++--
>  1 file changed, 3 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..3160900ad83 100644
> --- a/gdb/testsuite/gdb.base/step-over-syscall.exp
> +++ b/gdb/testsuite/gdb.base/step-over-syscall.exp
> @@ -321,6 +321,7 @@ proc step_over_syscall { syscall } {
>  # "on" or "off".
>  
>  proc break_cond_on_syscall { syscall follow_fork detach_on_fork } {
> +    global bkptno_numopt_re
>      with_test_prefix "break cond on target : $syscall" {
>  	set testfile "step-over-$syscall"
>  
> @@ -368,12 +369,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.*" \

I would suggest using the $::bkptno_numopt_re form (and removing the
global declaration), that makes it clear on use that this is a global
variable.  With that fixed:

Approved-By: Simon Marchi <simon.marchi@efficios.com>

Simon