From 61d97685844e0f8e1c2c7df0960744aaeced2a14 Mon Sep 17 00:00:00 2001
From: Zelidrag Hornung <zelidrag@chromium.org>
Date: Tue, 15 Jun 2010 11:55:21 -0700
Subject: [PATCH] added support for an alternative ssh port for autotest
 (needed for running autotest on Vibrant VM)

Review URL: http://codereview.chromium.org/2845002
---
 remote_access.sh    | 4 +++-
 run_remote_tests.sh | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/remote_access.sh b/remote_access.sh
index fe4383c27c..f34f30b0b6 100644
--- a/remote_access.sh
+++ b/remote_access.sh
@@ -10,6 +10,8 @@ ssh_keys/testing_rsa"
 DEFINE_string remote "" "remote hostname/IP of running Chromium OS instance"
 DEFINE_string private_key "$DEFAULT_PRIVATE_KEY" \
   "Private key of root account on remote host"
+DEFINE_integer ssh_port 22 \
+  "SSH port of the remote machine running Chromium OS instance"
 
 # Copies $1 to $2 on remote host
 function remote_cp() {
@@ -19,7 +21,7 @@ function remote_cp() {
 }
 
 function remote_sh() {
-  REMOTE_OUT=$(ssh  -o StrictHostKeyChecking=no -o \
+  REMOTE_OUT=$(ssh -p ${FLAGS_ssh_port} -o StrictHostKeyChecking=no -o \
     UserKnownHostsFile=$TMP_KNOWN_HOSTS root@$FLAGS_remote "$@")
   return ${PIPESTATUS[0]}
 }
diff --git a/run_remote_tests.sh b/run_remote_tests.sh
index 7418f284a1..0ec017e164 100755
--- a/run_remote_tests.sh
+++ b/run_remote_tests.sh
@@ -276,6 +276,7 @@ function main() {
     fi
 
     ${enter_chroot} ${autotest} --board "${FLAGS_board}" -m "${FLAGS_remote}" \
+      --ssh-port ${FLAGS_ssh_port} \
       "${option}" "${control_file}" -r "${results_dir}" ${verbose} \
       "${args[@]}"