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

run_remote_tests.sh

 #!/bin/bash
 
 # Copyright (c) 2009 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.
 
 # Script to run client or server tests on a live remote image.
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
@@ skipping 253 matching lines @@
 
     RAN_ANY_TESTS=${FLAGS_TRUE}
 
     # Remove chrome autotest location prefix from control_file if needed
     if [[ ${control_file:0:${#chrome_autotests}} == \
           "${chrome_autotests}" ]]; then
       control_file="${control_file:${#chrome_autotests}+1}"
       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}
 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"
       ${ENTER_CHROOT} sudo bash -c "${INSIDE_BUILD_DIR}/run_test.sh" >&2
     fi
   done
 
   echo ""
   info "Test results:"
   ./generate_test_report "${TMP}" --strip="${TMP}/"
 
   print_time_elapsed
 }
 
 main "$@"