[binutils-gdb] [gdb/testsuite] Fix breakpoint regexp in gdb.ada/out_of_line_in_inlined.exp

[Tom de Vries]

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

commit d0cc647211981cfdcb402694ea43334ba2c236bd
Author: Tom de Vries <tdevries@suse.de>
Date:   Mon Jun 12 11:14:24 2023 +0200

    [gdb/testsuite] Fix breakpoint regexp in gdb.ada/out_of_line_in_inlined.exp
    
    With a gdb 13.2 based package on openSUSE Tumbleweed i586, I ran into:
    ...
    (gdb) run ^M
    Starting program: out_of_line_in_inlined/foo_o224_021-all ^M
    [Thread debugging using libthread_db enabled]^M
    Using host libthread_db library "/lib/libthread_db.so.1".^M
    ^M
    Breakpoint 1.1, foo_o224_021.child1.child2 (s=...) at foo_o224_021.adb:26^M
    26                  for C of S loop^M
    (gdb) FAIL: gdb.ada/out_of_line_in_inlined.exp: scenario=all: \
      run to foo_o224_021.child1.child2
    ...
    
    I can reproduce the same issue with gdb trunk on x86_64, by using optimize=-O3
    instead of optimize=-O2.
    
    Fix this by using $bkptno_num_re.
    
    Tested on x86_64-linux.
    
    PR testsuite/30539
    Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30539

Diff:
---
 gdb/testsuite/gdb.ada/out_of_line_in_inlined.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdb/testsuite/gdb.ada/out_of_line_in_inlined.exp b/gdb/testsuite/gdb.ada/out_of_line_in_inlined.exp
index d14b1e70e64..c1c00c84931 100644
--- a/gdb/testsuite/gdb.ada/out_of_line_in_inlined.exp
+++ b/gdb/testsuite/gdb.ada/out_of_line_in_inlined.exp
@@ -34,7 +34,7 @@ foreach_with_prefix scenario {all minimal} {
 
     gdb_run_cmd
     gdb_test "" \
-	"Breakpoint $decimal, ($hex in )?foo_o224_021\\.child1\\.child2 \\(s=\\.\\.\\.\\).*" \
+	"Breakpoint ($decimal|$bkptno_num_re), ($hex in )?foo_o224_021\\.child1\\.child2 \\(s=\\.\\.\\.\\).*" \
 	"run to foo_o224_021.child1.child2"
 
     set opt_addr_in "($hex in)?"