Fixed run_remote_test.sh to work properly with the new location of chrome tests

run_remote_tests.sh

 #!/bin/bash
 
 # Copyright (c) 2009 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.
 
 # Script to run client or server tests on a live remote image.
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
@@ skipping 145 matching lines @@
 
   local autotest_dir=""
   if [[ -z "${FLAGS_prepackaged_autotest}" ]]; then
     learn_board
     autotest_dir="${GCLIENT_ROOT}/src/third_party/autotest/files"
   else
     autotest_dir="${FLAGS_prepackaged_autotest}"
   fi
 
   local control_files_to_run=""
-
+  local chrome_autotests="${CHROME_ROOT}/src/chrome/test/chromeos/autotest/files"
   # Now search for tests which unambiguously include the given identifier
   local search_path=$(echo {client,server}/{tests,site_tests})
+  # Include chrome autotest in the search path
+  if [ -n "${CHROME_ROOT}" ]; then
+    search_path="${search_path} ${chrome_autotests}/client/site_tests"
+  fi
   pushd ${autotest_dir} > /dev/null
   for test_request in $FLAGS_ARGV; do
     test_request=$(remove_quotes "${test_request}")
     ! finds=$(find ${search_path} -maxdepth 2 -type f \( -name control.\* -or \
       -name control \) | egrep -v "~$" | egrep "${test_request}")
     if [[ -z "${finds}" ]]; then
       echo_color "red" ">>> Cannot find match for \"${test_request}\""
       exit 1
     fi
     local matches=$(echo "${finds}" | wc -l)
@@ skipping 24 matching lines @@
 
   echo_color "yellow" ">>> Running the following control files:"
   for CONTROL_FILE in ${control_files_to_run}; do
     echo_color "yellow" " * " "${CONTROL_FILE}"
   done
 
   for control_file in ${control_files_to_run}; do
     # Assume a line starts with TEST_TYPE =
     control_file=$(remove_quotes "${control_file}")
     local type=$(read_test_type "${autotest_dir}/${control_file}")
+    # Check if the control file is an absolute path (i.e. chrome autotests case)
+    if [[ ${control_file:0:1} == "/" ]]; then
+      type=$(read_test_type "${control_file}")
+    fi
     local option
     if [[ "${type}" == "client" ]]; then
       option="-c"
     else
       option="-s"
     fi
     echo ""
     echo_color "yellow" ">>> Running ${type} test " ${control_file}
     local short_name=$(basename $(dirname "${control_file}"))
     local results_dir_name="${short_name}"
@@ skipping 15 matching lines @@
     # HACK: Temporary hack for cros-workon conversion
     [[ -n "${CROS_WORKON_SRCROOT}" ]] && WORKON_SUFFIX=_workon
 
     local enter_chroot=""
     local autotest="${GCLIENT_ROOT}/src/scripts/autotest${WORKON_SUFFIX}"
     if [[ ${INSIDE_CHROOT} -eq 0 ]]; then
       enter_chroot="./enter_chroot.sh --chroot ${FLAGS_chroot} --"
       autotest="./autotest${WORKON_SUFFIX}"
     fi
 
+    # Remove chrome autotest location prefix from control_file if needed
+    if [[ ${control_file:0:${#chrome_autotests}} == \
+          "${chrome_autotests}" ]]; then
+      control_file="${control_file:${#chrome_autotests}+1}"
+      echo_color "yellow" ">>> Running chrome autotest " ${control_file}
+    fi
+
     ${enter_chroot} ${autotest} --board "${FLAGS_board}" -m "${FLAGS_remote}" \
       --ssh-port ${FLAGS_ssh_port} \
       "${option}" "${control_file}" -r "${results_dir}" ${verbose} \
       "${args[@]}"
   done
 
   echo ""
   echo_color "yellow" ">>> Test results:"
   ./generate_test_report "${TMP}" --strip="${TMP}/"
 }
 
 main $@