Changes to enable buildbot to build autotests and package them

src/scripts/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 206 matching lines @@
     local withdev=""
     local jobs=" single job (slow but safe)"
     if [[ ${FLAGS_jobs} -gt 1 ]]; then
       jobs=" ${FLAGS_jobs} jobs (may cause build failure)"
     fi
     if [[ ${FLAGS_withdev} -eq ${FLAGS_TRUE} ]]; then
       withdev=" with dev packages"
     fi
     echo " * Build image${withdev}${jobs}"
     set_passwd=${FLAGS_TRUE}
+    if [[ ${FLAGS_build_autotest} -eq ${FLAGS_TRUE} ]]; then
+      echo " * Cross-build autotest client tests (build_autotest)"
+    fi
   fi
   if [[ ${FLAGS_master} -eq ${FLAGS_TRUE} ]]; then
     echo " * Master image (build_image)"
   fi
   if [[ -n "${FLAGS_grab_buildbot}" ]]; then
     if [[ "${FLAGS_grab_buildbot}" == "LATEST" ]]; then
       echo " * Grab latest buildbot image under ${FLAGS_buildbot_uri}"
     else
       echo " * Grab buildbot image zip at URI ${FLAGS_grab_buildbot}"
     fi
   fi
   if [[ ${FLAGS_mod_image_for_test} -eq ${FLAGS_TRUE} ]]; then
     echo " * Make image able to run tests (mod_image_for_test)"
     set_passwd=${FLAGS_TRUE}
   fi
   if [[ ${set_passwd} -eq ${FLAGS_TRUE} ]]; then
     if [[ -n "${FLAGS_chronos_passwd}" ]]; then
       echo " * Set chronos password to ${FLAGS_chronos_passwd}"
     else
       echo " * Set chronos password randomly"
     fi
   fi
-  if [[ ${FLAGS_build_autotest} -eq ${FLAGS_TRUE} ]]; then
-    echo " * Cross-build autotest client tests (build_autotest)"
-  fi
   if [[ -n "${FLAGS_image_to_usb}" ]]; then
     echo " * Write the image to USB device ${FLAGS_image_to_usb}"
   fi
   if [[ ${FLAGS_image_to_live} -eq ${FLAGS_TRUE} ]]; then
     echo " * Reimage live test Chromium OS instance at ${FLAGS_remote}"
   fi
   if [[ -n "${FLAGS_test}" ]]; then
     echo " * Run tests (${FLAGS_test}) on machine at ${FLAGS_remote}"
   fi
 }
@@ skipping 223 matching lines @@
         "--chroot=${FLAGS_chroot}" ${jobs_param}
   fi
 
   if [[ ${FLAGS_build} -eq ${FLAGS_TRUE} ]]; then
     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 "${board_param}"
     fi
+    local build_autotest_param=""
+    if [[ ${FLAGS_build_autotest} -eq ${FLAGS_TRUE} ]]; then
+      build_autotest_param="--withautotest"
+    fi
+
     run_phase_in_chroot "Building packages" \
         ./build_packages "${board_param}" \
-        ${jobs_param} ${withdev_param}
+        ${jobs_param} ${withdev_param} ${build_autotest_param}
 
     # TODO(kmixter): Enable this once build_tests works, but even
     # then only do it when not cross compiling.
     if [[ '' ]]; then
       run_phase_in_chroot "Building and running unit tests" \
         "./build_tests.sh && ./run_tests.sh"
     fi
   fi
 
   if [[ ${FLAGS_master} -eq ${FLAGS_TRUE} ]]; then
@@ skipping 19 matching lines @@
     run_phase "Installing image to USB" \
         ./image_to_usb.sh --yes "--to=${FLAGS_image_to_usb}" "${board_param}"
   fi
 
   if [[ ${FLAGS_image_to_live} -eq ${FLAGS_TRUE} ]]; then
     chdir_relative src/scripts
     run_phase "Re-imaging live Chromium OS machine ${FLAGS_remote}" \
       ./image_to_live.sh "--remote=${FLAGS_remote}" --update_known_hosts
   fi
 
-  if [[ ${FLAGS_build_autotest} -eq ${FLAGS_TRUE} ]]; then
-    chdir_relative src/scripts
-    run_phase_in_chroot "Building autotest" "./build_autotest.sh" \
-      --noprompt "${board_param}"
-  fi
-
   if [[ -n "${FLAGS_test}" ]]; then
     chdir_relative src/scripts
     # We purposefully do not quote FLAGS_test below as we expect it may
     # have multiple parameters
     run_phase "Running tests on Chromium OS machine ${FLAGS_remote}" \
       ./run_remote_tests.sh "--remote=${FLAGS_remote}" ${FLAGS_test} \
       "${board_param}"
   fi
 
   echo "Successfully used ${FLAGS_top} to:"
   describe_steps
   show_duration
 }
 
 
 main $@