From cded17bfca35566fa4d36e9ec06fa071bd7dab17 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Wed, 1 Feb 2023 17:09:47 +0000 Subject: [PATCH] gdb/testsuite: fix fetch_src_and_symbols.exp with native-gdbserver board I noticed that the gdb.debuginfod/fetch_src_and_symbols.exp script doesn't work with the native-gdbserver board, I see this error: ERROR: tcl error sourcing /tmp/build/gdb/testsuite/../../../src/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp. ERROR: gdbserver does not support run without extended-remote while executing "error "gdbserver does not support $command without extended-remote"" (procedure "gdb_test_multiple" line 51) invoked from within This was introduced with this commit: commit 7dd38e31d67c2548b52bea313ab18e40824c05da Date: Fri Jan 6 18:45:27 2023 -0500 gdb/linespec.c: Fix missing source file during breakpoint re-set The problem is that the above commit introduces a direct use of the "run" command, which doesn't work with 'target remote' targets, as exercised by the native-gdbserver board. To avoid this, in this commit I switch to using runto_main. However, calling runto_main will, by default, delete all the currently set breakpoints. As the point of the above commit was to check that a breakpoint set before stating an inferior would be correctly re-set, we need to avoid this breakpoint deleting behaviour. To do this I make use of with_override, and override the delete_breakpoints proc with a dummy proc which does nothing. By reverting the GDB changes in commit 7dd38e31d67c I have confirmed that even after my changes in this commit, the test still fails. But with the fixes in commit 7dd38e31d67c, this test now passed using the unix, native-gdbserver, and native-extended-gdbserver boards. --- .../gdb.debuginfod/fetch_src_and_symbols.exp | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp b/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp index c9cd8a30a1c..8158c5c3cc6 100644 --- a/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp +++ b/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp @@ -195,6 +195,12 @@ proc test_urls {urls pattern_re test} { $test } +# Used as a replacement for delete_breakpoints while calling +# runto_main in one case where we don't want to delete all the +# breakpoints. +proc disable_delete_breakpoints {} { +} + # Uses the global variables DEBUGDIR and DB which are setup elsewhere # in this script. # @@ -214,13 +220,12 @@ proc_with_prefix local_url { } { # GDB should now find the symbol and source files. clean_restart - set enable_debuginfod_question \ - "Enable debuginfod for this session. \\(y or \\\[n\\\]\\) " - gdb_test "file $binfile" "" "file [file tail $binfile]" \ - $enable_debuginfod_question "y" + gdb_test_no_output "set debuginfod enabled on" \ + "enabled debuginfod for initial test" + gdb_load $binfile gdb_test_no_output "set substitute-path $outputdir /dev/null" \ "set substitute-path" - gdb_test "br main" "Breakpoint 1 at.*file.*" + set lineno [gdb_get_line_number "Breakpoint here"] gdb_test "list $lineno" "return 0;\[^\r\n\]+Breakpoint here\\. .*" @@ -228,12 +233,18 @@ proc_with_prefix local_url { } { # of the source file in the debuginfod client cache differs from # the contents of DW_AT_comp_dir and DW_AT_name. gdb_test "set cwd $debugdir" "" "file [file tail $binfile] cwd" - gdb_test_no_output "del breakpoint 1" - gdb_test "break $lineno" "Breakpoint 2 at.*file.*" - gdb_test "run" "Breakpoint 2.*" \ - "file [file tail $binfile] set breakpoint" + gdb_breakpoint $lineno + with_override delete_breakpoints disable_delete_breakpoints { + if {![runto_main]} { + return + } + gdb_continue_to_breakpoint "runto breakpoint in main" \ + ".* Breakpoint here\\. .*" + } # GDB should now find the executable file. + set enable_debuginfod_question \ + "Enable debuginfod for this session. \\(y or \\\[n\\\]\\) " clean_restart gdb_test "core $::corefile" ".*return 0.*" "file [file tail $::corefile]" \ $enable_debuginfod_question "y" -- 2.30.2