Make sync_build_test and build_autotest support 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 65 matching lines @@
 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 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 $?
 }
 
 
 # Validates parameters and sets "intelligent" defaults based on other
 # parameters.
 function validate_and_set_param_defaults() {
   if [[ -z "${FLAGS_top}" ]]; then
     local test_dir=$(pwd)
     while [[ "${test_dir}" != "/" ]]; do
-      if [[ -d "${test_dir}/src/platform/pam_google" ]]; then
+      if [[ -d "${test_dir}/src/platform/dev" ]]; then
         FLAGS_top="${test_dir}"
         break
       fi
       test_dir=$(dirname "${test_dir}")
     done
   fi
 
   if [[ -z "${FLAGS_top}" ]]; then
     # Use the top directory based on where this script runs from
     FLAGS_top=$(dirname $(dirname $(dirname $0)))
   fi
 
   # Canonicalize any symlinks
   if [[ -d "${FLAGS_top}" ]]; then
     FLAGS_top=$(readlink -f "${FLAGS_top}")
   fi
 
+  if [[ -d "${FLAGS_top}" ]]; then
+    # Auto detect the right workflow.
+    if [[ -d "${FLAGS_top}/.git" ]]; then
+      FLAGS_useworkon=${FLAGS_FALSE}
+    else
+      FLAGS_useworkon=${FLAGS_TRUE}
+    fi
+  fi
+
   if [[ -z "${FLAGS_chroot}" ]]; then
     FLAGS_chroot="${FLAGS_top}/chroot"
   fi
 
   # If chroot does not exist, force making it
   if [[ ! -d "${FLAGS_chroot}" ]]; then
     FLAGS_force_make_chroot=${FLAGS_TRUE}
   fi
-
   # If chrome_root option passed, set as option for ./enter_chroot
   if [[ -n "${FLAGS_chrome_root}" ]]; then
     chroot_options="--chrome_root=${FLAGS_chrome_root}"
   fi
 
   if [[ -z "${FLAGS_repo}" ]]; then
     if is_google_environment; then
       FLAGS_repo="ssh://git@chromiumos-git//chromeos"
     else
       FLAGS_repo="http://src.chromium.org/git/chromiumos.git"
     fi
   fi
 
   if [[ -n "${FLAGS_test}" ]]; then
     # If you specify that tests should be run, we assume the image
     # is modified to run tests.
     FLAGS_mod_image_for_test=${FLAGS_TRUE}
     # If you specify that tests should be run, we assume you want
     # to live update the image.
     FLAGS_image_to_live=${FLAGS_TRUE}
+    if [[ ${FLAGS_useworkon} -eq ${FLAGS_TRUE} ]]; then
+      # Currently the workon flow does not enable tests to be dynamically
+      # built during run_remote_tests, so we need to build them all
+      # beforehand.
+      FLAGS_build_autotest=${FLAGS_TRUE}
+    fi
   fi
 
   # If they gave us a remote host, then we assume they want us to do a live
   # update.
   if [[ -n "${FLAGS_remote}" ]]; then
     FLAGS_image_to_live=${FLAGS_TRUE}
   fi
 
   # Grabbing a buildbot build is exclusive with syncing and building
   if [[ -n "${FLAGS_grab_buildbot}" ]]; then
@@ skipping 43 matching lines @@
       echo "Could not verify that ${device} for image_to_usb is removable"
       exit 1
     fi
   fi
 }
 
 
 # Prints a description of what we are doing or did
 function describe_steps() {
   if [[ ${FLAGS_sync} -eq ${FLAGS_TRUE} ]]; then
-    echo " * Sync client (gclient sync)"
+    if [[ ${FLAGS_useworkon} -eq ${FLAGS_TRUE} ]]; then
+      echo " * Sync client (repo sync)"
+    else
+      echo " * Sync client (gclient sync)"
+    fi
     if is_google_environment; then
       echo " * Create proper src/scripts/.chromeos_dev"
     fi
   fi
   if [[ ${FLAGS_force_make_chroot} -eq ${FLAGS_TRUE} ]]; then
     echo " * Rebuild chroot (make_chroot) in ${FLAGS_chroot}"
   fi
   local set_passwd=${FLAGS_FALSE}
   if [[ ${FLAGS_build} -eq ${FLAGS_TRUE} ]]; then
     local withdev=""
@@ skipping 53 matching lines @@
   echo "Planning these steps on ${FLAGS_top}:"
   describe_steps
   read -p "Are you sure (y/N)? " SURE
   # Get just the first character
   if [[ "${SURE:0:1}" != "y" ]]; then
     echo "Ok, better safe than sorry."
     exit 1
   fi
 }
 
-
-# Runs gclient config on a new checkout directory.
-function config_new_checkout() {
-  # We only know how to check out to a pattern like ~/foo/chromeos so
-  # make sure that's the pattern the user has given.
-  echo "Checking out ${FLAGS_top}"
-  if [[ $(basename "${FLAGS_top}") != "chromeos" ]]; then
-    echo "The --top directory does not exist and to check it out requires"
-    echo "the name to end in chromeos (try --top=${FLAGS_top}/chromeos)"
-    exit 1
-  fi
-  local top_parent=$(dirname "${FLAGS_top}")
-  mkdir -p "${top_parent}"
-  cd "${top_parent}"
-  gclient config "${FLAGS_repo}"
-}
-
-
 # Changes to a directory relative to the top/root directory of
 # the checkout.
 # Arguments:
 #   $1 - relative path
 function chdir_relative() {
   local dir=$1
   echo "+ cd ${dir}"
   # Allow use of .. before the innermost directory of FLAGS_top exists
   if [[ "${dir}" == ".." ]]; then
     dir=$(dirname "${FLAGS_top}")
@@ skipping 62 matching lines @@
 
 # Display duration
 function show_duration() {
   local current_time=$(date '+%s')
   local duration=$((${current_time} - ${START_TIME}))
   local minutes_duration=$((${duration} / 60))
   local seconds_duration=$((${duration} % 60))
   printf "Total time: %d:%02ds\n" "${minutes_duration}" "${seconds_duration}"
 }
 
+# Runs gclient config on a new checkout directory.
+function config_new_gclient_checkout() {
+  # We only know how to check out to a pattern like ~/foo/chromeos so
+  # make sure that's the pattern the user has given.
+  if [[ $(basename "${FLAGS_top}") != "chromeos" ]]; then
+    echo "The --top directory does not exist and to check it out requires"
+    echo "the name to end in chromeos (try --top=${FLAGS_top}/chromeos)"
+    exit 1
+  fi
+  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
+}
+
+# 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
+}
 
 # Runs gclient sync, setting up .chromeos_dev and preparing for
 # local repo setup
 function sync() {
   # cd to the directory below
-  chdir_relative ..
-  run_phase "Synchronizing client" gclient sync
+  if [[ ${FLAGS_useworkon} -eq ${FLAGS_TRUE} ]]; then
+    chdir_relative .
+    run_phase "Synchronizing client" repo sync
+    # Change to a directory that is definitely a git repo
+    chdir_relative src/third_party/chromiumos-overlay
+    git cl config "file://$(pwd)/../../../codereview.settings"
+  else
+    chdir_relative ..
+    run_phase "Synchronizing client" gclient sync
+    chdir_relative .
+    git cl config "file://$(pwd)/codereview.settings"
+  fi
   chdir_relative .
-  git cl config "file://$(pwd)/codereview.settings"
   if is_google_environment; then
     local base_dir=$(dirname $(dirname "${FLAGS_top}"))
     echo <<EOF > src/scripts/.chromeos_dev
-# Use internal chromeos-deb repository
-CHROMEOS_EXT_MIRROR="http://chromeos-deb/ubuntu"
-CHROMEOS_EXT_SUITE="karmic"
-
 # Assume Chrome is checked out nearby
 CHROMEOS_CHROME_DIR="${base_dir}/chrome"
 EOF
   fi
 }
 
 
 # Downloads a buildbot image
 function grab_buildbot() {
   if [[ "${FLAGS_grab_buildbot}" == "LATEST" ]]; then
@@ skipping 87 matching lines @@
   if [[ ${FLAGS_sync} -eq ${FLAGS_TRUE} ]]; then
     sync
   fi
 
   if [[ -n "${FLAGS_grab_buildbot}" ]]; then
     grab_buildbot
   fi
 
   if [[ ${FLAGS_force_make_chroot} -eq ${FLAGS_TRUE} ]]; then
     chdir_relative src/scripts
-    run_phase "Replacing chroot" ./make_chroot --replace \
+    local extra_flags="--nouseworkon"
+    [[ ${FLAGS_useworkon} -eq ${FLAGS_TRUE} ]] && extra_flags="--useworkon"
+    run_phase "Replacing chroot" ./make_chroot ${extra_flags} --replace \
         "--chroot=${FLAGS_chroot}" ${jobs_param}
   fi
 
   if [[ ${FLAGS_build} -eq ${FLAGS_TRUE} ]]; then
     local pkg_param=""
     if [[ ${FLAGS_usepkg} -eq ${FLAGS_FALSE} ]]; then
       pkg_param="--nousepkg"
     fi
 
     chdir_relative src/scripts
@@ skipping 65 matching lines @@
   fi
 
   trap - EXIT
   echo "Successfully used ${FLAGS_top} to:"
   describe_steps
   show_duration
 }
 
 
 main $@