2013-08-29 Sterling Augustine <saugustine@google.com>
* boards/remote-stdio-gdbserver.exp: Set rcp_prog and rsh_prog in new conditional. Move use of REMOTE_PORTNUM into said conditional.
This commit is contained in:
parent
1af12a7ddd
commit
489d4f4d01
2 changed files with 15 additions and 6 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2013-08-29 Sterling Augustine <saugustine@google.com>
|
||||||
|
|
||||||
|
* boards/remote-stdio-gdbserver.exp: Set rcp_prog and
|
||||||
|
rsh_prog in new conditional. Move use of REMOTE_PORTNUM into
|
||||||
|
said conditional.
|
||||||
|
|
||||||
2013-08-29 Phil Muldoon <pmuldoon@redhat.com>
|
2013-08-29 Phil Muldoon <pmuldoon@redhat.com>
|
||||||
|
|
||||||
* gdb.python/py-arch.exp: Load gdb-python.exp.
|
* gdb.python/py-arch.exp: Load gdb-python.exp.
|
||||||
|
|
|
@ -26,9 +26,6 @@
|
||||||
|
|
||||||
load_board_description "native-stdio-gdbserver"
|
load_board_description "native-stdio-gdbserver"
|
||||||
|
|
||||||
set_board_info rsh_prog /usr/bin/ssh
|
|
||||||
set_board_info rcp_prog /usr/bin/scp
|
|
||||||
|
|
||||||
# Test machine info. The generic_config gdbserver reads some of these
|
# Test machine info. The generic_config gdbserver reads some of these
|
||||||
# values from board_info, so this file must set them there.
|
# values from board_info, so this file must set them there.
|
||||||
if [info exists REMOTE_USERNAME] {
|
if [info exists REMOTE_USERNAME] {
|
||||||
|
@ -41,8 +38,17 @@ if [info exists REMOTE_HOSTNAME] {
|
||||||
} else {
|
} else {
|
||||||
set_board_info hostname unspecified_hostname
|
set_board_info hostname unspecified_hostname
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# The two programs have different syntax to set the remote port, so
|
||||||
|
# set it as part of the program name rather than in get_remote_login.
|
||||||
|
|
||||||
if [info exists REMOTE_PORTNUM] {
|
if [info exists REMOTE_PORTNUM] {
|
||||||
set_board_info portnum $REMOTE_PORTNUM
|
set_board_info portnum $REMOTE_PORTNUM
|
||||||
|
set_board_info rsh_prog "/usr/bin/ssh -p$REMOTE_PORTNUM"
|
||||||
|
set_board_info rcp_prog "/usr/bin/scp -P$REMOTE_PORTNUM"
|
||||||
|
} else {
|
||||||
|
set_board_info rsh_prog /usr/bin/ssh
|
||||||
|
set_board_info rcp_prog /usr/bin/scp
|
||||||
}
|
}
|
||||||
|
|
||||||
# Some remote machines don't have writable home directories.
|
# Some remote machines don't have writable home directories.
|
||||||
|
@ -64,9 +70,6 @@ proc get_remote_login { } {
|
||||||
if {[board_info [target_info name] exists hostname]} {
|
if {[board_info [target_info name] exists hostname]} {
|
||||||
append result "[board_info [target_info name] hostname]"
|
append result "[board_info [target_info name] hostname]"
|
||||||
}
|
}
|
||||||
if {[board_info [target_info name] exists portnum]} {
|
|
||||||
append result ":[board_info [target_info name] portnum]"
|
|
||||||
}
|
|
||||||
return $result
|
return $result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue