forked from Imagelibrary/binutils-gdb
This patch makes it possible to run tests requiring passing arguments to
the inferior with the native-gdbserver board. The end goal is to write
a test that verifies passing arguments to the inferior works, and to
have that test exercise inferior arguments passed on the gdbserver
command line, when using the native-gdbserver target board (in addition
to the other boards). This is done in the next patch.
With the native-gdbserver target board, gdbserver is started in
gdb_reload (implemented in config/gdbserver.exp), called in gdb_run_cmd.
gdb_run_cmd already supposedly accepts inferior arguments (although that
feature does not seem to be used anywhere), which it passes to the `run`
command, for non-stub target boards. I've changed gdb_run_cmd so that
it forwards these arguments to gdb_reload as well. gdb_reload passes
them to gdbserver_run, and they eventually make their way to the
gdbserver command line.
gdb_run_cmd currently accepts `args` (the varargs of tcl), which means
it receives inferior arguments as a list. This won't work with
arguments with spaces, because they will end up being formatted with
curly braces like this:
% set args [list hello "with spaces" world]
hello {with spaces} world
% puts "run $args"
run hello {with spaces} world
I've changed it to accept a single string that is passed to `run` and
gdb_reload. I've done the same change in gdb_start_cmd and
gdb_starti_cmd, although these two are not used with native-gdbserver.
I've changed all gdb_reload implementations in the tree to accept a new
inferior_args argument, although most of them don't do anything with it
(and don't need to). People maintaining target boards out of tree will
need to do the same.
I found two tests to adjust to avoid adding new failures or errors.
These tests needed new [use_gdb_stub] checks, because they rely on
having GDB run new processes. These are guarded by a [target_info
exists noargs], which made them get skipped on native-gdbserver. But
now that the native-gdbserver board supports args, this is no longer
enough.
Note that with this change, noargs and use_gdb_stub are orthogonal. It
took me a moment to grasp this, so I thought I would spell out the
different possible situations:
- !noargs and !use_gdb_stub: inferior process started by gdb, can pass
args
- noargs and !use_gdb_stub: inferior process started by gdb (perhaps
through extended-remote protocol, the simulator, some other target),
but that target doesn't support inferior arguments
- noargs and use_gdb_stub: inferior process started by some other
program to which GDB connects using the remote protocol, that program
does not support passing args to the inferior process
- !noargs and use_gdb_stub: inferior process started by some other
program to which GDB connects u sing the remote protocol, that program
supports passing args to the inferior process
gdb/testsuite/ChangeLog:
* lib/gdb.exp (gdb_run_cmd): Change argument from args to
inferior_args. Pass it to gdb_reload.
(gdb_start_cmd, gdb_starti_cmd): Change argument from args to
inferior_args.
(gdb_reload): Add inferior_args argument.
* config/gdbserver.exp (gdb_reload): Add inferior_args argument,
pass it to gdbserver_run.
* boards/native-gdbserver.exp: Do not set noargs.
* boards/native-extended-gdbserver.exp (gdb_reload): Add
inferior_args argument.
* boards/stdio-gdbserver-base.exp (gdb_reload): Likewise.
* gdb.base/a2-run.exp: Check for use_gdb_stub.
* gdb.base/args.exp: Likewise.
Change-Id: Ibda027c71867157852f34700342ab31edf39e4d8
173 lines
4.5 KiB
Plaintext
173 lines
4.5 KiB
Plaintext
# Copyright 1988-2020 Free Software Foundation, Inc.
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
# This file was written by Rob Savoye. (rob@cygnus.com)
|
|
|
|
# Can't do this test without stdio support.
|
|
if [gdb_skip_stdio_test "a2run.exp"] {
|
|
return
|
|
}
|
|
|
|
#
|
|
# test running programs
|
|
#
|
|
|
|
standard_testfile run.c
|
|
|
|
if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
|
|
return -1
|
|
}
|
|
|
|
# Run with no arguments.
|
|
gdb_run_cmd
|
|
|
|
set saw_usage 0
|
|
set saw_exit_wrapper 0
|
|
set saw_spurious_output 0
|
|
|
|
set test "run \"$testfile\" with no args"
|
|
|
|
# Indirect spawn id lists. Used to be able to disable the inferior
|
|
# and gdb's spawn_ids and regexes as soon as we see the expected
|
|
# output.
|
|
set inferior_spawn_list "$inferior_spawn_id"
|
|
set gdb_spawn_list "$gdb_spawn_id"
|
|
|
|
# Clear either the gdb or the inferior spawn_id list and iff
|
|
# afterwards we still have any spawn id in the indirect lists,
|
|
# continue expecting.
|
|
proc maybe_exp_continue {which} {
|
|
global inferior_spawn_list gdb_spawn_list
|
|
|
|
if {$which == "gdb"} {
|
|
set gdb_spawn_list ""
|
|
} elseif {$which == "inferior"} {
|
|
set inferior_spawn_list ""
|
|
} else {
|
|
error "invalid parameter"
|
|
}
|
|
|
|
if {$inferior_spawn_list != "" || $gdb_spawn_list != ""} {
|
|
exp_continue
|
|
}
|
|
}
|
|
|
|
# Note that if $inferior_spawn_id != $gdb_spawn_id the order we pick
|
|
# output from each spawn id is undefined.
|
|
set res [gdb_test_multiple "" $test {
|
|
-i inferior_spawn_list
|
|
-re "usage: factorial <number>" {
|
|
set saw_usage 1
|
|
maybe_exp_continue inferior
|
|
}
|
|
-re "EXIT code 1" {
|
|
set saw_exit_wrapper 1
|
|
maybe_exp_continue inferior
|
|
}
|
|
eof {
|
|
if {$inferior_spawn_id != $gdb_spawn_id} {
|
|
# In this case we may see the server/inferior exit before
|
|
# GDB's program exit output. Remove from spawn list and
|
|
# continue waiting.
|
|
maybe_exp_continue inferior
|
|
} else {
|
|
# GDB crash.
|
|
fail "$test (eof)"
|
|
}
|
|
}
|
|
|
|
-i gdb_spawn_list
|
|
|
|
-re "$inferior_exited_re with code 01.\r\n$gdb_prompt $" {
|
|
maybe_exp_continue gdb
|
|
}
|
|
-re "$inferior_exited_re with code 01.*$gdb_prompt $" {
|
|
set saw_spurious_output 1
|
|
maybe_exp_continue gdb
|
|
}
|
|
|
|
-re "$inferior_exited_re normally.\r\n$gdb_prompt $" {
|
|
# This is only considered a pass if we see the exit wrapper
|
|
# status.
|
|
maybe_exp_continue gdb
|
|
}
|
|
-re "$inferior_exited_re normally.*$gdb_prompt $" {
|
|
set saw_spurious_output 1
|
|
maybe_exp_continue gdb
|
|
}
|
|
}]
|
|
|
|
if {$res == 0} {
|
|
gdb_assert ${saw_usage} $test
|
|
|
|
if {$saw_exit_wrapper} {
|
|
set msg "$test (exit wrapper)"
|
|
} else {
|
|
set msg $test
|
|
}
|
|
|
|
gdb_assert !$saw_spurious_output "no spurious messages at program exit"
|
|
|
|
}
|
|
|
|
# The remaining tests don't work for targets can't take arguments...
|
|
|
|
if [target_info exists noargs] then {
|
|
verbose "Skipping rest of a2-run.exp because of noargs."
|
|
return
|
|
}
|
|
|
|
# Now run with some arguments
|
|
setup_xfail "arm-*-coff"
|
|
gdb_run_cmd 5
|
|
gdb_test_stdio "" "120" "" "run \"$testfile\" with arg"
|
|
|
|
# Run again with same arguments.
|
|
gdb_run_cmd 5
|
|
|
|
setup_xfail "arm-*-coff"
|
|
gdb_test_stdio "" "120" "" "run \"$testfile\" again with same args"
|
|
|
|
# Use "set args" command to specify no arguments as default and run again.
|
|
gdb_test_no_output "set args"
|
|
|
|
gdb_run_cmd
|
|
|
|
gdb_test_stdio "" "usage: factorial <number>" "" "run after setting args to nil"
|
|
|
|
# The remaining tests pass inferior arguments through GDB, so doesn't
|
|
# work with stub targets, where GDB connects to debug an already started
|
|
# process.
|
|
|
|
if [use_gdb_stub] {
|
|
verbose "Skipping rest of a2-run.exp because target is a stub."
|
|
return
|
|
}
|
|
|
|
# Use "set args" command to specify an argument and run again.
|
|
gdb_test_no_output "set args 6"
|
|
|
|
gdb_run_cmd
|
|
|
|
setup_xfail "arm-*-coff"
|
|
gdb_test_stdio "" "720" "" "run \"$testfile\" again after setting args"
|
|
|
|
# GOAL: Test that shell is being used with "run". For remote debugging
|
|
# targets, there is no guarantee that a "shell" (whatever that is) is used.
|
|
if ![is_remote target] then {
|
|
gdb_test_stdio "run `echo 8`" \
|
|
"40320" "" "run \"$testfile\" with shell"
|
|
}
|