mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-09 14:06:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: If83bf22fde6259b64fdd007066b5c46c7925d120

BUG=
TEST=Run a few tests inside and outside chroot

Review URL: http://codereview.chromium.org/3790005
This commit is contained in:
Ken Mixter 2010-10-18 13:34:29 -07:00
parent 273cdc8a3e
commit b8a72348e4
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
run_remote_tests.sh
View File

@ -21,7 +21,6 @@ DEFINE_string board "$DEFAULT_BOARD" \
DEFINE_string chroot "${DEFAULT_CHROOT_DIR}" "alternate chroot location" c DEFINE_string chroot "${DEFAULT_CHROOT_DIR}" "alternate chroot location" c
DEFINE_boolean cleanup ${FLAGS_FALSE} "Clean up temp directory" DEFINE_boolean cleanup ${FLAGS_FALSE} "Clean up temp directory"
DEFINE_integer iterations 1 "Iterations to run every top level test" i 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_string results_dir_root "" "alternate root results directory"
DEFINE_boolean verbose ${FLAGS_FALSE} "Show verbose autoserv output" v DEFINE_boolean verbose ${FLAGS_FALSE} "Show verbose autoserv output" v
@ -156,17 +155,8 @@ function main() {
remote_access_init remote_access_init
local autotest_dir="" learn_board
if [[ -z "${FLAGS_prepackaged_autotest}" ]]; then autotest_dir="${FLAGS_chroot}/build/${FLAGS_board}/usr/local/autotest"
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
local control_files_to_run="" local control_files_to_run=""
local chrome_autotests="${CHROME_ROOT}/src/chrome/test/chromeos/autotest/files" local chrome_autotests="${CHROME_ROOT}/src/chrome/test/chromeos/autotest/files"
@ -253,14 +243,11 @@ function main() {
RAN_ANY_TESTS=${FLAGS_TRUE} RAN_ANY_TESTS=${FLAGS_TRUE}
# HACK: Temporary hack for cros-workon conversion
[[ -n "${CROS_WORKON_SRCROOT}" ]] && WORKON_SUFFIX=_workon
local enter_chroot="" 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 if [[ ${INSIDE_CHROOT} -eq 0 ]]; then
enter_chroot="./enter_chroot.sh --chroot ${FLAGS_chroot} --" enter_chroot="./enter_chroot.sh --chroot ${FLAGS_chroot} --"
autotest="./autotest${WORKON_SUFFIX}" autotest="./autotest_workon"
fi fi
# Remove chrome autotest location prefix from control_file if needed # Remove chrome autotest location prefix from control_file if needed