More work to make sync_build_test build autotests with workon

sync_build_test.sh

 #!/bin/bash
 
 # Copyright (c) 2010 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 sync your checkout, build a Chromium OS image, and test it all
 # with one command.  Can also check out a new Chromium OS checkout and
 # perform a subset of the above operations.
 #
@@ skipping 54 matching lines @@
 DEFINE_boolean image_to_live ${FLAGS_FALSE} \
     "Put the resulting image on live instance (requires --remote)"
 DEFINE_string image_to_usb "" \
     "Treat this device as USB and put the image on it after build"
 # You can set jobs > 1 but then your build may break and you may need
 # to retry.  Setting it to 1 is best for non-interactive sessions.
 DEFINE_boolean interactive ${FLAGS_FALSE} \
     "Tell user what we plan to do and wait for input to proceed" i
 DEFINE_integer jobs -1 "Concurrent build jobs"
 DEFINE_boolean master ${FLAGS_TRUE} "Master an image from built code"
+DEFINE_boolean minilayout ${FLAGS_FALSE} "Use minimal code checkout"
 DEFINE_boolean mod_image_for_test ${FLAGS_FALSE} "Modify the image for testing"
 DEFINE_string remote "" \
     "Use this hostname/IP for live updating and running tests"
 DEFINE_string repo "${CHROMIUMOS_REPO}" "gclient repo for chromiumos"
 DEFINE_boolean sync ${FLAGS_TRUE} "Sync the checkout"
 DEFINE_string test "" \
     "Test the built image with the given params to run_remote_tests"
 DEFINE_string top "" \
     "Root directory of your checkout (defaults to determining from your cwd)"
 DEFINE_boolean withdev ${FLAGS_TRUE} "Build development packages"
 DEFINE_boolean usepkg ${FLAGS_TRUE} "Use binary packages"
-DEFINE_boolean useworkon ${FLAGS_FALSE} "Use cros_workon/repo workflow"
+DEFINE_boolean useworkon ${FLAGS_TRUE} "Use cros_workon/repo workflow"
 DEFINE_boolean unittest ${FLAGS_TRUE} "Run unit tests"
 
 # Returns a heuristic indicating if we believe this to be a google internal
 # development environment.
 # Returns:
 #   0 if so, 1 otherwise
 function is_google_environment() {
   hostname | egrep -q .google.com\$
   return $?
 }
@@ skipping 301 matching lines @@
   local top_parent=$(dirname "${FLAGS_top}")
   mkdir -p "${top_parent}"
   cd "${top_parent}"
   gclient config "${FLAGS_repo}"
 }
 
 # Runs repo init on a new checkout directory.
 function config_new_repo_checkout() {
   mkdir -p "${FLAGS_top}"
   cd "${FLAGS_top}"
-  repo init -u http://src.chromium.org/git/manifest -m minilayout.xml
+  local minilayout=""
+  [ ${FLAGS_minilayout} -eq ${FLAGS_TRUE} ] && minilayout="-m minilayout.xml"
+  repo init -u http://src.chromium.org/git/manifest ${minilayout}
 }
 
 # Configures/initializes a new checkout
 function config_new_checkout() {
   echo "Checking out ${FLAGS_top}"
   if [[ ${FLAGS_useworkon} ]]; then
     config_new_repo_checkout
   else
     config_new_gclient_checkout
   fi
@@ skipping 140 matching lines @@
 
     chdir_relative src/scripts
     # Only setup board target if the directory does not exist
     if [[ ! -d "${FLAGS_top}/chroot/build/${FLAGS_board}" ]]; then
       run_phase_in_chroot "Setting up board target" \
           ./setup_board ${pkg_param} "${board_param}"
     fi
     local build_autotest_param=""
     if [[ ${FLAGS_build_autotest} -eq ${FLAGS_TRUE} ]]; then
       build_autotest_param="--withautotest"
+      if [[ ${FLAGS_useworkon} -eq ${FLAGS_TRUE} ]]; then
+        # In workon flow, you must workon packages to run tests
+        run_phase_in_chroot "Setting workon for autotest" \
+          ./cros_workon --board=${FLAGS_board} start autotest \
+          autotest-tests autotest-deps
+        # In minilayout you may not yet have autotest.
+        if [[ ! -d "${FLAGS_top}/src/third_party/autotest/files" ]]; then
+          run_phase "Syncing autotest repo" repo sync autotest
+        fi
+      fi
     fi
 
     run_phase_in_chroot "Building packages" \
         ./build_packages "${board_param}" \
         ${jobs_param} ${withdev_param} ${build_autotest_param} \
         ${pkg_param}
   fi
 
   if [[ ${FLAGS_chrome_root} ]]; then
     run_phase_in_chroot "Building Chromium browser" \
@@ skipping 47 matching lines @@
   fi
 
   trap - EXIT
   echo "Successfully used ${FLAGS_top} to:"
   describe_steps
   show_duration
 }
 
 
 main $@