Revert "Remove the dependency to autotest_run.sh so I can get rid of it in next CL."

run_remote_tests.sh

Index: run_remote_tests.sh
diff --git a/run_remote_tests.sh b/run_remote_tests.sh
index 9df83a5b6cd64a3e3e0d16a9604be83fd4ec5e08..babbbdceb045f371810f96c7da1063de67f90a65 100755
--- a/run_remote_tests.sh
+++ b/run_remote_tests.sh
@@ -271,20 +271,25 @@ function main() {
       info "Running chrome autotest ${control_file}"
     fi
 
-    local autoserv_test_args="${FLAGS_args}"
-    if [ -n "${autoserv_test_args}" ]; then
-      autoserv_test_args="-a \"${autoserv_test_args}\""
-    fi
-    local autoserv_args="-m ${FLAGS_remote} --ssh-port ${FLAGS_ssh_port} \
+    export AUTOSERV_TEST_ARGS="${FLAGS_args}"
+    export AUTOSERV_ARGS="-m ${FLAGS_remote} \
+        --ssh-port ${FLAGS_ssh_port} \
         ${option} ${control_file} -r ${results_dir} ${verbose}"
     if [ ${FLAGS_build} -eq ${FLAGS_FALSE} ]; then
-      pushd ${autotest_dir} > /dev/null
-      sudo chmod a+w server/{tests,site_tests}
-      ./server/autoserv ${autoserv_args} ${autoserv_test_args}
-      popd > /dev/null
+      cat > "${TMP}/run_test.sh" <<EOF
+export AUTOSERV_TEST_ARGS="${AUTOSERV_TEST_ARGS}"
+export AUTOSERV_ARGS="${AUTOSERV_ARGS}"
+cd /home/${USER}/trunk/src/scripts
+./autotest_run.sh --board "${FLAGS_board}"
+EOF
+      chmod a+rx "${TMP}/run_test.sh"
+      ${ENTER_CHROOT} ${TMP_INSIDE_CHROOT}/run_test.sh >&2
     else
       cp "${BUILD_DIR}/environment" "${TMP}/run_test.sh"
       GRAPHICS_BACKEND=${GRAPHICS_BACKEND:-OPENGL}
+      if [ -n "${AUTOSERV_TEST_ARGS}" ]; then
+        AUTOSERV_TEST_ARGS="-a \"${AUTOSERV_TEST_ARGS}\""
+      fi
       cat >> "${TMP}/run_test.sh" <<EOF
 export GCLIENT_ROOT=/home/${USER}/trunk
 export GRAPHICS_BACKEND=${GRAPHICS_BACKEND}
@@ -292,7 +297,7 @@ export SSH_AUTH_SOCK=${SSH_AUTH_SOCK} TMPDIR=/tmp SSH_AGENT_PID=${SSH_AGENT_PID}
 export SYSROOT=/build/${FLAGS_board}
 tc-export CC CXX PKG_CONFIG
 cd ${INSIDE_BUILD_DIR}
-./server/autoserv ${autoserv_args} ${autoserv_test_args}
+./server/autoserv ${AUTOSERV_ARGS} ${AUTOSERV_TEST_ARGS}
 EOF
       sudo cp "${TMP}/run_test.sh" "${BUILD_DIR}"
       sudo chmod a+rx "${BUILD_DIR}/run_test.sh"