mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-09 14:06:58 +02:00
Allow prepackaged to still be passed and make learn_board work again
Change-Id: I664858ff9b931479fe2fac89a24aa3e7fce8493b BUG= TEST=ran rrt without ==board or default board set Review URL: http://codereview.chromium.org/3431004
This commit is contained in:
parent
82e95c43e7
commit
ef45f16aa2
@ -154,16 +154,14 @@ function main() {
|
||||
|
||||
remote_access_init
|
||||
|
||||
# HACK: Temporary hack for cros-workon conversion
|
||||
# In cros-workon, we always use the prepackaged tests, because the locations
|
||||
# where tests come from are possibly infinite.
|
||||
[[ -n "${CROS_WORKON_SRCROOT}" ]] && \
|
||||
FLAGS_prepackaged_autotest="/build/${FLAGS_board}/usr/local/autotest/"
|
||||
|
||||
local autotest_dir=""
|
||||
if [[ -z "${FLAGS_prepackaged_autotest}" ]]; then
|
||||
learn_board
|
||||
autotest_dir="${GCLIENT_ROOT}/src/third_party/autotest/files"
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user