From 85025e0631ed4b0e8c3aa85d7561a715f142bdc6 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Mon, 12 Jun 2023 11:14:24 +0200 Subject: [PATCH] [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 --- 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 03092a15188..08245777d84 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)?" base-commit: 11a41bc318ba0307248eadf29bf7d4a1af31d3a8 -- 2.35.3