RE: [pushed] [gdb/testsuite] Fix gdb.ada/out_of_line_in_inlined.exp for ppc64le

[Carl Love <cel@us.ibm.com>]

Tom:

On Mon, 2022-11-28 at 23:09 +0100, Tom de Vries wrote:
>  Yes, that also works for me as well as $bkptno_num_re which I
> mentioned
> > in my previous email work for me.  I guess my preference would be
> > $bkptno_num_re if it also works for you.
> 
> That one doesn't work.  As mentioned in the comment, it attempts to
> match:
> ...
> # A regular expression that matches a breakpoint hit with a
> breakpoint 
> 
> # having several code locations. 
> 
> set bkptno_num_re "$decimal\\.$decimal"
> ...
> in other words, "1.1" and in my case there's only one code location,
> in 
> other words, "1".

Yea, right.  So I think we are down to the following patch that works
on my Power 10 with no regressions.  It sounds like this one works for
you as well.  

          Carl 
------------------------------------------
Additional Fix for gdb.ada/out_of_line_in_inlined.exp for ppc64le

The command to set the breakpoing on foo_o224_021.child1.child2 with
Power 10, Fedora release 36 (Thirty Six) gives the following output:

  (gdb) break foo_o224_021.child1.child2^M
  Breakpoint 1 at 0x10011870: foo_o224_021.child1.child2. (3 locations)
  (gdb) run
  Starting program: ...gdb.ada/out_of_line_in_inlined/foo_o224_021-all
  Thread debugging using libthread_db enabled]
  Using host libthread_db library "/lib64/libthread_db.so.1".

  Breakpoint 1.1, foo_o224_021.child1.child2 (s=...) at ...gdb.ada/out_of_line_in_inlined/foo_o224_021.adb:27
  27                      Do_Nothing (C);
  (gdb) FAIL: gdb.ada/out_of_line_in_inlined.exp: scenario=all: run to foo_o224_021.child1.child2


The issue appears to be that gdb prints the breakpoint number as 1.1
instead of the expected value of 1.  It appears this is due to a compile
optimization resulting in two breakpoints.

This patch fixes the issue by accepting both breakpoint numbers.

This patch has been tested on Power 10.
---
 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 621b04e179b..5698a0632a1 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}(\\.$decimal)?, ($hex in )?foo_o224_021\\.child1\\.child2 \\(s=\\.\\.\\.\\).*" \
 	"run to foo_o224_021.child1.child2"
 
     set opt_addr_in "($hex in)?"
-- 
2.37.2