OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't redefine upload/download/file in gdbserver-base 

Before patch

  Make native gdbserver boards no longer be "remote" (in DejaGnu terms)
  739b3f1d8f

the local gdbserver boards (except native-extended-gdbserver...) were
considered as remote by DejaGNU.  To avoid DejaGNU trying to use ssh/scp
to download the files to the target (which is actually local), the
gdbserver-base.exp file defined some _download, _upload and _file board
operations to override the default behavior, and instead just use local
operations.

The same patch also changed remote-stdio-gdbserver.exp to make it
inherit from gdbserver-base.exp.  Since then, this board (which is
actually remote) uses the overrides with local file operations.  As a
result, files are never actually copied to the target.

I think we can simply remove the overrides from gdbserver-base.exp.
Because all boards should be properly considered local or remote by
DejaGNU, it should by default use the right method for transferring
files.

gdb/testsuite/ChangeLog:

	PR gdb/22841
	* boards/gdbserver-base.exp (${board}_file, ${board}_download,
	${board}_upload): Remove.
This commit is contained in:
Simon Marchi 2018-03-08 17:53:57 -05:00 committed by Simon Marchi
parent d3d50934a9
commit e4fe375676
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2018-03-08 Simon Marchi <simon.marchi@polymtl.ca>
PR gdb/22841
* boards/gdbserver-base.exp (${board}_file, ${board}_download,
${board}_upload): Remove.
2018-03-07 Andreas Arnez <arnez@linux.vnet.ibm.com>
* gdb.cp/watch-cp.cc: New test.

22
gdb/testsuite/boards/gdbserver-base.exp
View File

@ -32,25 +32,3 @@ set_board_info gdb,nofileio 1
set_board_info gdb,predefined_tsv "\\\$trace_timestamp"
set GDBFLAGS "${GDBFLAGS} -ex \"set auto-connect-native-target off\""
proc ${board}_file { dest op args } {
if { $op == "delete" } {
return 0
}
return [eval [list standard_file $dest $op] $args]
}
proc ${board}_download { board host dest } {
# We pass DEST in standard_output_file, regardless of whether it is absolute
# or relative, because we don't want the tests to be able to write outside
# their standard output directory.
set dest [standard_output_file $dest]
file copy -force $host $dest
return $dest
}
proc ${board}_upload {dest srcfile args} {
return $srcfile
}