diff options
author | Yao Qi <yao.qi@linaro.org> | 2016-09-21 11:43:22 +0100 |
---|---|---|
committer | Yao Qi <yao.qi@linaro.org> | 2016-09-22 14:36:54 +0100 |
commit | 90681dabc79316d382aae5e932303f61bd705b16 (patch) | |
tree | 021d1f766b6d9685d7d3c3a33d2799c467e9071c | |
parent | 0ec22c2c9fd06505f333c00235b3328a632bb69c (diff) | |
download | gdb-90681dabc79316d382aae5e932303f61bd705b16.zip gdb-90681dabc79316d382aae5e932303f61bd705b16.tar.gz gdb-90681dabc79316d382aae5e932303f61bd705b16.tar.bz2 |
Use gdbserver-base in remote-gdbserver-on-localhost.exp
This patch is to make remote-gdbserver-on-localhost.exp use gdbserver-base
and remove duplicated code.
gdb/testsuite:
2016-09-22 Yao Qi <yao.qi@linaro.org>
* boards/gdbserver-base.exp (gdb_server_prog): Set the absolute
path.
* boards/remote-gdbserver-on-localhost.exp: Use gdbserver-base.
Remove duplication.
-rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
-rw-r--r-- | gdb/testsuite/boards/gdbserver-base.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/boards/remote-gdbserver-on-localhost.exp | 37 |
3 files changed, 9 insertions, 37 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index fb0ca38..4acd9ae 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,12 @@ 2016-09-22 Yao Qi <yao.qi@linaro.org> + * boards/gdbserver-base.exp (gdb_server_prog): Set the absolute + path. + * boards/remote-gdbserver-on-localhost.exp: Use gdbserver-base. + Remove duplication. + +2016-09-22 Yao Qi <yao.qi@linaro.org> + * lib/gdbserver-support.exp: Check the existence of gdbserver_orig_gdb_exit rather than gdbserver_gdb_exit. diff --git a/gdb/testsuite/boards/gdbserver-base.exp b/gdb/testsuite/boards/gdbserver-base.exp index 02a9244..2b50588 100644 --- a/gdb/testsuite/boards/gdbserver-base.exp +++ b/gdb/testsuite/boards/gdbserver-base.exp @@ -22,7 +22,7 @@ process_multilib_options "" set_board_info compiler "[find_gcc]" # Test the copy of gdbserver in the build directory. -set_board_info gdb_server_prog "../gdbserver/gdbserver" +set_board_info gdb_server_prog "[pwd]/../gdbserver/gdbserver" # gdbserver does not intercept target file operations and perform them # on the host. diff --git a/gdb/testsuite/boards/remote-gdbserver-on-localhost.exp b/gdb/testsuite/boards/remote-gdbserver-on-localhost.exp index ca907bf..ee3c6e7 100644 --- a/gdb/testsuite/boards/remote-gdbserver-on-localhost.exp +++ b/gdb/testsuite/boards/remote-gdbserver-on-localhost.exp @@ -21,11 +21,7 @@ # bash$ make check RUNTESTFLAGS="--target_board=remote-gdbserver-on-localhost" load_generic_config "gdbserver" - -# The default compiler for this target. -set_board_info compiler "[find_gcc]" - -process_multilib_options "" +load_board_description "gdbserver-base" # The sshd should be running on localhost and ssh key should be # correctly set up that you ssh to localhost without having to type @@ -39,44 +35,13 @@ set_board_info hostname localhost # We will be using the standard GDB remote protocol set_board_info gdb_protocol "remote" -# Test the copy of gdbserver in the build directory, of an absolute path. -set_board_info gdb_server_prog "[pwd]/../gdbserver/gdbserver" - # Use techniques appropriate to a stub set_board_info use_gdb_stub 1 # This gdbserver can only run a process once per session. set_board_info gdb,do_reload_on_run 1 -# gdbserver does not intercept target file operations and perform them -# on the host. -set_board_info gdb,nofileio 1 - # There's no support for argument-passing (yet). set_board_info noargs 1 set_board_info exit_is_reliable 1 - -# The predefined TSVs in GDBserver. -set_board_info gdb,predefined_tsv "\\\$trace_timestamp" - -set GDBFLAGS "${GDBFLAGS} -ex \"set auto-connect-native-target off\"" - -proc ${board}_download { board src dest } { - if { [file pathtype $src] == "relative" } { - return [file join [pwd] $src] - } else { - return $src - } -} - -proc ${board}_upload {dest srcfile args} { - return $srcfile -} - -proc ${board}_file { dest op args } { - if { $op == "delete" } { - return 0 - } - return [eval [list standard_file $dest $op] $args] -} |