Install test scripts into chroot.

cros_run_vm_test

 #!/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.
 #
 # Runs a given test case under a VM.
 
-. $(dirname "$(readlink -f "$0")")/outside_chroot_common.sh 2> /dev/null ||
-  SCRIPT_ROOT=/usr/lib/crosutils
-. "${SCRIPT_ROOT}/common.sh" ||
-  (echo "Unable to load common.sh" && false) ||
+# This can only run inside the chroot.
+. "/usr/lib/crosutils/common.sh" 2> /dev/null ||

[petkov, 2011/03/30 14:32:16]

msb changed this in a few places to just source common.sh || exit 1. this seems
to be enough because you get an error message from bash anyway. and it's a one
liner.

[sosa, 2011/03/30 18:35:50]

Done.

+  (echo "Must run within chroot" && false) ||
   exit 1
-. "${SCRIPT_ROOT}/lib/cros_vm_lib.sh" || die "Unable to load cros_vm_lib.sh"
-. "${SCRIPT_ROOT}/lib/cros_vm_constants.sh" || \
+. "/usr/lib/crosutils/lib/cros_vm_lib.sh" || die "Unable to load cros_vm_lib.sh"

[petkov, 2011/03/30 14:32:16]

it might be worth defining CROSUTILS and using it throughout.

[sosa, 2011/03/30 18:35:50]

Done.

+. "/usr/lib/crosutils/lib/cros_vm_constants.sh" || \

[petkov, 2011/03/30 14:32:16]

no need for trailing \

[sosa, 2011/03/30 18:35:50]

Done.

   die "Unable to load cros_vm_constants.sh"
 
 get_default_board
 
 DEFINE_string board "$DEFAULT_BOARD" \
     "The board for which you built autotest." b
 DEFINE_string image_path "" "Full path of the VM image"
 DEFINE_string results_dir_root "" "alternate root results directory"
 DEFINE_string test_case "" "Name of the test case to run"
 DEFINE_boolean use_emerged ${FLAGS_FALSE} \
     "Force use of emerged autotest packages"
-DEFINE_string verify_chrome_version "" \
-    "Verify that this chrome version matches that on vm."
 
 set -e
 
 # Returns normally if the given $1 is a valid chrome version.
 chrome_version_is_valid() {
   local chrome_version="$1"
   echo ${chrome_version} | egrep '^[0-9]+.[0-9]+.[0-9]+.[0-9]+$' &> /dev/null
 }
 
 # Parse command line.
 FLAGS "$@" || exit 1
 
 # Use latest if not specified.
 if [ -z "${FLAGS_image_path}" ]; then
-  LATEST_IMAGE="$(${SCRIPTS_DIR}/get_latest_image.sh \
+  LATEST_IMAGE="$(/usr/lib/crosutils/get_latest_image.sh \
       --board=${FLAGS_board})/${DEFAULT_QEMU_IMAGE}"
   info "Using latest vm image ${LATEST_IMAGE}"
   FLAGS_image_path=${LATEST_IMAGE}
 fi
 
 [ -e "${FLAGS_image_path}" ] || die "Image ${FLAGS_image_path} does not exist."
 
 if [ -n "${FLAGS_test_case}" ]; then
   warn "Use of --test_case=<test> is being deprecated.  Just pass test names \
 as separate command line arguments."
@@ skipping 11 matching lines @@
 tests=( )
 [ -n "${FLAGS_test_case}" ] && tests=( "${FLAGS_test_case}" )
 for test in ${FLAGS_ARGV}; do
   tests=( "${tests[@]}" "$(remove_quotes "${test}")" )
 done
 
 trap stop_kvm EXIT
 start_kvm "${FLAGS_image_path}"
 retry_until_ssh
 
-if [ -n "${FLAGS_verify_chrome_version}" ]; then

[sosa, 2011/03/30 01:09:42]

No one uses this

-  info "Verifying version of Chrome matches what we expect."
-  if chrome_version_is_valid "${FLAGS_verify_chrome_version}"; then
-    chrome_version_on_vm=$("${SCRIPTS_DIR}/bin/cros_get_chrome_version" \
-        --remote=127.0.0.1 \
-        --ssh_port=${FLAGS_ssh_port})
-    [[ ${chrome_version_on_vm} == ${FLAGS_verify_chrome_version} ]] || \
-        warn "CHROME_VERSION is no longer set.This check will be removed"
-  else
-    warn "${FLAGS_verify_chrome_version} is not a valid Chrome version"
-  fi
-fi
-
-"${SCRIPTS_DIR}/run_remote_tests.sh" \
+run_remote_tests.sh \

[petkov, 2011/03/30 14:32:16]

you're relying on crosutils to be on the path? why don't you do the same for
get_latest_image.sh above too?

[sosa, 2011/03/30 18:35:50]

All scripts (non-symlinks) in src/scripts are installed in /usr/lib/crosutils
... first-order bin's are installed in /usr/bin.  run_remote_tests is managed by
this package and installed by the Makefile in /usr/bin

On 2011/03/30 14:32:16, petkov wrote:

     --board=${FLAGS_board} \
     --ssh_port=${FLAGS_ssh_port} \
     --remote=127.0.0.1 \
     --results_dir_root="${FLAGS_results_dir_root}" \
     ${USE_EMERGED} \
     "${tests[@]}"