Re-work automation setup scripts.

src/scripts/run_autotest.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 install and launch autotest.
 
 . "$(dirname "$0")/common.sh"
 
@@ skipping 23 matching lines @@
 function cleanup {
   if [ "${TEST_AUTH_SOCKET:0:26}" == ${CHROOT_AUTHSOCK_PREFIX} ]
   then
     echo "cleaning up chrooted ssh-agent."
     kill ${SSH_AGENT_PID}
   fi
 }
 
 trap cleanup EXIT
 
-# Copy a local "installation" of autotest into the chroot, to avoid
-# polluting the src dir with tmp files, results, etc.
-# TODO: use rsync to ensure we don't get stuck with an old install.
-if [ 1 != ${FLAGS_force} ] || [ ! -f "${AUTOTEST_CHROOT_DEST}/server/autosrv" ]
-  then 
-    echo -n "Installing Autotest... "
-    sudo mkdir -p "${AUTOTEST_CHROOT_DEST}"
-    sudo cp -rp ${AUTOTEST_SRC}/* ${AUTOTEST_CHROOT_DEST}
-    echo "done."
-  else
-    echo "Autotest found in chroot, skipping copy."
-fi
-
-# Add all third_party and system tests to site_tests.
-for type in client server
-do
-  echo -n "Adding ${type}_tests into autotest's ${type}/site_tests... "
-  sudo cp -rp ${GCLIENT_ROOT}/src/platform/testing/${type}_tests/* \
-    ${AUTOTEST_CHROOT_DEST}/${type}/site_tests/
-done
-
 # If ssh-agent isn't already running, start one (possibly inside the chroot)
 if [ ! -n "${SSH_AGENT_PID}" ]
 then
   echo "Setting up ssh-agent in chroot for testing."
   TEST_AUTH_SOCKET=$(mktemp -u ${CHROOT_AUTHSOCK_PREFIX}.XXXX)
   eval $(/usr/bin/ssh-agent -a ${TEST_AUTH_SOCKET})
 fi
 
 # Install authkey for testing
 
@@ skipping 18 matching lines @@
   echo "running autoserv: " ${autoserv_cmd}
   ${autoserv_cmd}
 else
   echo "To execute autotest manually:
   eval \$(ssh-agent)        # start ssh-agent
   ssh-add $FLAGS_test_key  # add test key to agent
   # Then execute autoserv:
   $autoserv_cmd"
 fi