Re: [patch] Set remote port numbers correctly in remote-stdio-gdbserver.exp

[Sterling Augustine <saugustine@google.com>]

[-- Attachment #1: Type: text/plain, Size: 658 bytes --]

On Thu, Aug 29, 2013 at 11:40 AM, Sterling Augustine
<saugustine@google.com> wrote:
> The enclosed fairly straightforward patch to the board file
> remote-stdio-gdbserver.exp fixes the syntax scp and rsh use to select
> the remote port, which was broken before.
>
> Tested with both default and custom remote ports.
>
> OK for trunk?
>
> Sterling
>
> testsuite/ChangeLog
>
> 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.


Let's try that again with the patch actually attached.....

[-- Attachment #2: remote-stdio-gdbserver.patch --]
[-- Type: application/octet-stream, Size: 1678 bytes --]

Index: testsuite/boards/remote-stdio-gdbserver.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/boards/remote-stdio-gdbserver.exp,v
retrieving revision 1.1
diff -u -p -r1.1 remote-stdio-gdbserver.exp
--- testsuite/boards/remote-stdio-gdbserver.exp	21 May 2013 17:58:46 -0000	1.1
+++ testsuite/boards/remote-stdio-gdbserver.exp	29 Aug 2013 18:33:04 -0000
@@ -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
 }