From e65e500f532dad17a89703bbe7337cedec0dee8c Mon Sep 17 00:00:00 2001
From: Chris Sosa <sosa@chromium.org>
Date: Fri, 25 Mar 2011 15:39:30 -0700
Subject: [PATCH] Restore ssh test as its a direct dep of cros_vm_lib.sh

Moved this incorrectly.  This is only used by
cros_vm_lib.sh and therefore should stay wherever it is.

Change-Id: Ib9cc02479f53184a85345288f6abd8fedffb563e

BUG=chromium-os:13948
TEST=NA

Review URL: http://codereview.chromium.org/6747015
---
 ssh_test.sh | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)
 mode change 120000 => 100755 ssh_test.sh

diff --git a/ssh_test.sh b/ssh_test.sh
deleted file mode 120000
index efff7985ed..0000000000
--- a/ssh_test.sh
+++ /dev/null
@@ -1 +0,0 @@
-../platform/crostestutils/ssh_test.sh
\ No newline at end of file
diff --git a/ssh_test.sh b/ssh_test.sh
new file mode 100755
index 0000000000..ef5eb57491
--- /dev/null
+++ b/ssh_test.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Run remote access test to ensure ssh access to a host is working. Exits with
+# a code of 0 if successful and non-zero otherwise. Used by test infrastructure
+# scripts.
+
+# --- BEGIN COMMON.SH BOILERPLATE ---
+# Load common CrOS utilities.  Inside the chroot this file is installed in
+# /usr/lib/crosutils.  Outside the chroot we find it relative to the script's
+# location.
+find_common_sh() {
+  local common_paths=(/usr/lib/crosutils $(dirname "$(readlink -f "$0")"))
+  local path
+
+  SCRIPT_ROOT=
+  for path in "${common_paths[@]}"; do
+    if [ -r "${path}/common.sh" ]; then
+      SCRIPT_ROOT=${path}
+      break
+    fi
+  done
+}
+
+find_common_sh
+. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
+# --- END COMMON.SH BOILERPLATE ---
+
+. "${SCRIPT_ROOT}/remote_access.sh" || die "Unable to load remote_access.sh"
+
+function cleanup {
+  cleanup_remote_access
+  rm -rf "${TMP}"
+}
+
+function main() {
+  cd "${SCRIPTS_DIR}"
+
+  FLAGS "$@" || exit 1
+  eval set -- "${FLAGS_ARGV}"
+
+  set -e
+
+  trap cleanup EXIT
+
+  TMP=$(mktemp -d /tmp/ssh_test.XXXX)
+
+  remote_access_init
+}
+
+main $@