[binutils-gdb] [gdb/testsuite] Allow debug srcfile2 in gdb.base/unwind-on-each-insn.exp

[Tom de Vries]

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

commit d25a8dbc7c3ae12aea8a203ce64f78608e22daa0
Author: Tom de Vries <tdevries@suse.de>
Date:   Wed Jan 25 15:24:17 2023 +0100

    [gdb/testsuite] Allow debug srcfile2 in gdb.base/unwind-on-each-insn.exp
    
    Test-case gdb.base/unwind-on-each-insn.exp compiles $srcfile with debug info, and
    $srcfile2 without.
    
    Occasionally, I try both files with debug info:
    ...
    -             $srcfile $debug_flags $srcfile2 $nodebug_flags]]} {
    +             $srcfile $debug_flags $srcfile2 $debug_flags]]} {
    ...
    
    This shortcuts the test due to no longer recognizing that stepi still lands
    in foo.
    
    Fix this by determining whether still in foo by checking the info frame output.
    
    Tested on x86_64-linux.

Diff:
---
 gdb/testsuite/gdb.base/unwind-on-each-insn.exp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/gdb.base/unwind-on-each-insn.exp b/gdb/testsuite/gdb.base/unwind-on-each-insn.exp
index d6f90dde8c1..059967a2b2e 100644
--- a/gdb/testsuite/gdb.base/unwind-on-each-insn.exp
+++ b/gdb/testsuite/gdb.base/unwind-on-each-insn.exp
@@ -142,9 +142,11 @@ proc do_test { function step_cmd } {
 		break
 	    }
 
+	    gdb_test $step_cmd
+
 	    set in_fn 0
-	    gdb_test_multiple $step_cmd "" {
-		-re -wrap "$::hex in $function \\(\\)" {
+	    gdb_test_multiple "info frame" "" {
+		-re -wrap "rip = $::hex in ${function}( \\(.*\\))?;.*" {
 		    set in_fn 1
 		}
 		-re -wrap "" {}