crosutil: No longer use autotest-0.0.1 in run_remote_tests even outside chroot

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.
 
 . "$(dirname $0)/common.sh"
 . "$(dirname $0)/remote_access.sh"
 
 get_default_board
 
 DEFINE_string args "" "Command line arguments for test, separated with comma" a
 DEFINE_string board "$DEFAULT_BOARD" \
     "The board for which you are building autotest"
 DEFINE_string chroot "${DEFAULT_CHROOT_DIR}" "alternate chroot location" c
 DEFINE_boolean cleanup ${FLAGS_FALSE} "Clean up temp directory"
 DEFINE_integer iterations 1 "Iterations to run every top level test" i
-DEFINE_string prepackaged_autotest "" "Use this prepackaged autotest dir"
 DEFINE_string results_dir_root "" "alternate root results directory"
 DEFINE_boolean verbose ${FLAGS_FALSE} "Show verbose autoserv output" v
 
 RAN_ANY_TESTS=${FLAGS_FALSE}
 
 # Check if our stdout is a tty
 function is_a_tty() {
   local stdout=$(readlink /proc/$$/fd/1)
   [[ "${stdout#/dev/tty}" != "${stdout}" ]] && return 0
   [[ "${stdout#/dev/pts}" != "${stdout}" ]] && return 0
@@ skipping 114 matching lines @@
     else
       TMP=$(mktemp -d /tmp/run_remote_tests.XXXX)
     fi
     TMP_INSIDE_CHROOT=${TMP}
   fi
 
   trap cleanup EXIT
 
   remote_access_init
 
-  local autotest_dir=""
-  if [[ -z "${FLAGS_prepackaged_autotest}" ]]; then
-    learn_board
-    if [[ -n "${CROS_WORKON_SRCROOT}" ]]; then
-      autotest_dir="/build/${FLAGS_board}/usr/local/autotest"
-    else
-      autotest_dir="${GCLIENT_ROOT}/src/third_party/autotest/files"
-    fi
-  else
-    autotest_dir="${FLAGS_prepackaged_autotest}"
-  fi
+  learn_board
+  autotest_dir="${FLAGS_chroot}/build/${FLAGS_board}/usr/local/autotest"
 
   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
@@ skipping 66 matching lines @@
     local results_dir_name="${short_name}"
     local results_dir="${TMP_INSIDE_CHROOT}/${results_dir_name}"
     rm -rf "${results_dir}"
     local verbose=""
     if [[ ${FLAGS_verbose} -eq $FLAGS_TRUE ]]; then
       verbose="--verbose"
     fi
 
     RAN_ANY_TESTS=${FLAGS_TRUE}
 
-    # 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}"
+    local autotest="${GCLIENT_ROOT}/src/scripts/autotest_workon"
     if [[ ${INSIDE_CHROOT} -eq 0 ]]; then
       enter_chroot="./enter_chroot.sh --chroot ${FLAGS_chroot} --"
-      autotest="./autotest${WORKON_SUFFIX}"
+      autotest="./autotest_workon"
     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
     if [[ -n "${FLAGS_args}" ]]; then
       passthrough_args="--args=${FLAGS_args}"
     fi
 
     ${enter_chroot} ${autotest} --board "${FLAGS_board}" -m "${FLAGS_remote}" \
       --ssh-port ${FLAGS_ssh_port} \
       "${option}" "${control_file}" -r "${results_dir}" ${verbose} \
       "${passthrough_args}" >&2
   done
 
   echo ""
   echo_color "yellow" ">>> Test results:"
   ./generate_test_report "${TMP}" --strip="${TMP}/"
 
   print_time_elapsed
 }
 
 main "$@"