commit 5d8d47f72f6686d0d9885d8d5ab0a4be5439ab56
author Aviv Keshet <akeshet@chromium.org> Wed Aug 21 15:30:41 2013 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Oct 22 21:39:19 2013 +0000
tree 4f6508d628e5ec646e5e15b0520cc9ca14777a07
parent 5dfd56356c5cf1c7331964ee3240bd1769e76def

update run_remote_tests to point at usr/local/build/autotest

CQ-DEPEND=CL:I836d933e8a828177304dd10a74841138a9502aff
BUG=chromium:256906
TEST=See CQ-DEPEND'ed CL. Also, tested backward compatibility of
run_remote_tests against
pre-CL:I836d933e8a828177304dd10a74841138a9502aff builds.
Change-Id: Iaf9f4d54d73e45973a0edc775d6db967cb71446d
Reviewed-on: https://chromium-review.googlesource.com/62877
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
Tested-by: Aviv Keshet <akeshet@chromium.org>
Commit-Queue: Aviv Keshet <akeshet@chromium.org>

run_remote_tests.sh

diff --git a/run_remote_tests.sh b/run_remote_tests.sh
index f9664c0..08757cc 100755
--- a/run_remote_tests.sh
+++ b/run_remote_tests.sh
@@ -174,7 +174,12 @@
 
 autodetect_build() {
   if [ ${FLAGS_use_emerged} -eq ${FLAGS_TRUE} ]; then
-    AUTOTEST_DIR="/build/${FLAGS_board}/usr/local/autotest"
+    if [ -d "/build/${FLAGS_board}/usr/local/autotest/site_utils" ]; then
+      AUTOTEST_DIR="/build/${FLAGS_board}/usr/local/autotest"
+    else
+      AUTOTEST_DIR="/build/${FLAGS_board}/usr/local/build/autotest"
+    fi
+
     FLAGS_build=${FLAGS_FALSE}
     if [ ! -d "${AUTOTEST_DIR}" ]; then
       die \
@@ -212,7 +217,7 @@
     fi
     info "Build and run autotests from ${AUTOTEST_DIR}."
   else
-    AUTOTEST_DIR="/build/${FLAGS_board}/usr/local/autotest"
+    AUTOTEST_DIR="/build/${FLAGS_board}/usr/local/build/autotest"
     if [ ! -d "${AUTOTEST_DIR}" ]; then
       die \
 "Autotest was not emerged, ${AUTOTEST_DIR} does not exist. You should \