Changes to enable buildbot to build autotests and package them

src/scripts/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)/autotest_lib.sh"
 . "$(dirname $0)/remote_access.sh"
 
 DEFAULT_OUTPUT_FILE=test-output-$(date '+%Y%m%d.%H%M%S')
 
+DEFINE_string build_desc "" "Build description used in database"
+DEFINE_string chroot "${DEFAULT_CHROOT_DIR}" "alternate chroot location" c
 DEFINE_boolean cleanup ${FLAGS_TRUE} "Clean up temp directory"
 DEFINE_integer iterations 1 "Iterations to run every top level test" i
+DEFINE_string machine_desc "" "Machine description used in database"
 DEFINE_string output_file "${DEFAULT_OUTPUT_FILE}" "Test run output" o
+DEFINE_string prepackaged_autotest "" "Use this prepackaged autotest dir"
+DEFINE_string results_dir_root "" "alternate root results directory"
+DEFINE_boolean update_db ${FLAGS_FALSE} "Put results in autotest database" u
 DEFINE_boolean verbose ${FLAGS_FALSE} "Show verbose autoserv output" v
-DEFINE_boolean update_db ${FLAGS_FALSE} "Put results in autotest database" u
-DEFINE_string machine_desc "" "Machine description used in database"
-DEFINE_string build_desc "" "Build description used in database"
-DEFINE_string chroot "${DEFAULT_CHROOT_DIR}" "alternate chroot location" c
-DEFINE_string results_dir_root "" "alternate root results directory"
 
 function cleanup() {
   if [[ $FLAGS_cleanup -eq ${FLAGS_TRUE} ]]; then
     rm -rf "${TMP}"
   else
     echo "Left temporary files at ${TMP}"
   fi
   cleanup_remote_access
 }
 
@@ skipping 51 matching lines @@
   cd $(dirname "$0")
 
   FLAGS "$@" || exit 1
 
   if [[ -z "${FLAGS_ARGV}" ]]; then
     echo "Please specify tests to run, like:"
     echo "  $0 --remote=MyMachine SystemBootPerf"
     exit 1
   fi
 
-  check_board
-
-  local parse_cmd="$(dirname $0)/../third_party/autotest/files/tko/parse.py"
-
-  if [[ ${FLAGS_update_db} -eq ${FLAGS_TRUE} && ! -x "${parse_cmd}" ]]; then
-    echo "Cannot find parser ${parse_cmd}"
-    exit 1
-  fi
-
   set -e
 
   # Set global TMP for remote_access.sh's sake
   TMP=$(mktemp -d /tmp/run_remote_tests.XXXX)
 
   rm -f "${FLAGS_output_file}"
 
   trap cleanup EXIT
 
-  # Always copy into installed autotest directory.  This way if a user
-  # is just modifying scripts, they take effect without having to wait
-  # for the laborious build_autotest.sh command.
-  local original="${GCLIENT_ROOT}/src/third_party/autotest/files"
-  local autotest_dir="${FLAGS_chroot}/build/${FLAGS_board}/usr/local/autotest"
-  update_chroot_autotest "${original}" "${autotest_dir}"
+  local autotest_dir=""
+  if [[ -z "${FLAGS_prepackaged_autotest}" ]]; then
+    check_board
+    # Always copy into installed autotest directory.  This way if a user
+    # is just modifying scripts, they take effect without having to wait
+    # for the laborious build_autotest.sh command.
+    local original="${GCLIENT_ROOT}/src/third_party/autotest/files"
+    autotest_dir="${FLAGS_chroot}/build/${FLAGS_board}/usr/local/autotest"
+    update_chroot_autotest "${original}" "${autotest_dir}"
+  else
+    autotest_dir="${FLAGS_prepackaged_autotest}"
+  fi
+
+  local parse_cmd="${autotest_dir}/tko/parse.py"
+
+  if [[ ${FLAGS_update_db} -eq ${FLAGS_TRUE} && ! -x "${parse_cmd}" ]]; then
+    echo "Cannot find parser ${parse_cmd}"
+    exit 1
+  fi
 
   local autoserv="${autotest_dir}/server/autoserv"
 
   local control_files_to_run=""
 
   # Now search for tests which unambiguously include the given identifier
   local search_path=$(echo ${autotest_dir}/{client,server}/{tests,site_tests})
   for test_request in $FLAGS_ARGV; do
     test_request=$(remove_quotes "${test_request}")
     ! finds=$(find ${search_path} -type f -name control | \
@@ skipping 82 matching lines @@
         echo "Parse failed." | tee -a "${FLAGS_output_file}"
         FLAGS_cleanup=${FLAGS_FALSE}
       fi
     fi
   done
 
   echo "Output stored to ${FLAGS_output_file}"
 }
 
 main $@