[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 --git a/gdb/testsuite/gdb.base/unwind-on-each-insn.exp b/gdb/testsuite/gdb.base/unwind-on-each-insn.exp
index d6f90dde8c197a268c85b069a8f6b6f75dde52be..059967a2b2e321bef06336bb3056f4fdd260d49d 100644 (file)
--- 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 "" {}