diff options
| author | Sterling Augustine <saugustine@google.com> | 2013-08-29 19:22:06 +0000 |
|---|---|---|
| committer | Sterling Augustine <saugustine@google.com> | 2013-08-29 19:22:06 +0000 |
| commit | 489d4f4d01d74ffd193587ae23bb7e9bedc687d4 (patch) | |
| tree | e5b04ccf332b6d40a8eb2e74b59e10c684caef6c /gdb/testsuite | |
| parent | 1af12a7dddcceabbdf734a64d08b9070278543d8 (diff) | |
| download | gdb-489d4f4d01d74ffd193587ae23bb7e9bedc687d4.zip gdb-489d4f4d01d74ffd193587ae23bb7e9bedc687d4.tar.gz gdb-489d4f4d01d74ffd193587ae23bb7e9bedc687d4.tar.bz2 | |
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.
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/boards/remote-stdio-gdbserver.exp | 15 |
2 files changed, 15 insertions, 6 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 2aefa56..3b259c7 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -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> * gdb.python/py-arch.exp: Load gdb-python.exp. diff --git a/gdb/testsuite/boards/remote-stdio-gdbserver.exp b/gdb/testsuite/boards/remote-stdio-gdbserver.exp index 2daa35f..df2f555 100644 --- a/gdb/testsuite/boards/remote-stdio-gdbserver.exp +++ b/gdb/testsuite/boards/remote-stdio-gdbserver.exp @@ -26,9 +26,6 @@ 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 # values from board_info, so this file must set them there. if [info exists REMOTE_USERNAME] { @@ -41,8 +38,17 @@ if [info exists REMOTE_HOSTNAME] { } else { 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] { 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. @@ -64,9 +70,6 @@ proc get_remote_login { } { if {[board_info [target_info name] exists 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 } |