Update mod_image_for_test to support --fast option.

mod_image_for_test.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 modify a keyfob-based chromeos system image for testability.
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
@@ skipping 14 matching lines @@
     "Modify the image for factory install shim"
 DEFINE_string image "" "Location of the rootfs raw image file" i
 DEFINE_boolean installmask $FLAGS_TRUE \
     "Use INSTALL_MASK to shrink the resulting image." m
 DEFINE_integer jobs -1 \
     "How many packages to build in parallel at maximum." j
 DEFINE_string qualdb "" "Location of qualified component file" d
 DEFINE_boolean yes $FLAGS_FALSE "Answer yes to all prompts" y
 DEFINE_string build_root "/build" \
     "The root location for board sysroots."
+DEFINE_boolean fast ${FLAGS_FALSE} "Call many emerges in parallel"

[Nick Sanders, 2010/07/20 07:30:16]

can you add passthough to image_to_usb? not necessary for this cl tho

 
 
 # Parse command line
 FLAGS "$@" || exit 1
 eval set -- "${FLAGS_ARGV}"
 
 EMERGE_CMD="emerge"
 EMERGE_BOARD_CMD="emerge-${FLAGS_board}"
-TOP_SCRIPTS_DIR="$(dirname $0)"
-if [ -e "${TOP_SCRIPTS_DIR}/.emerge" ]; then
-  .  "${TOP_SCRIPTS_DIR}/.emerge"
+if [ "${FLAGS_fast}" -eq "${FLAGS_TRUE}" ]; then
+  echo "Using alternate emerge"
+  EMERGE_CMD="${SCRIPTS_DIR}/parallel_emerge"
+  EMERGE_BOARD_CMD="${EMERGE_CMD} --board=${FLAGS_board}"
 fi
 
 # No board, no default and no image set then we can't find the image
 if [ -z $FLAGS_image ] && [ -z $FLAGS_board ] ; then
   setup_board_warning
   die "mod_image_for_test failed.  No board set and no image set"
 fi
 
 # We have a board name but no image set.  Use image at default location
 if [ -z $FLAGS_image ] ; then
@@ skipping 32 matching lines @@
 # Emerges chromeos-test onto the image.
 emerge_chromeos_test() {
   INSTALL_MASK=""
   if [[ $FLAGS_installmask -eq ${FLAGS_TRUE} ]]; then
     INSTALL_MASK="$DEFAULT_INSTALL_MASK"
   fi
 
   # Determine the root dir for test packages.
   ROOT_DEV_DIR="$ROOT_FS_DIR/usr/local"
 
-  INSTALL_MASK="$INSTALL_MASK" $EMERGE_BOARD_CMD \
+  sudo INSTALL_MASK="$INSTALL_MASK" $EMERGE_BOARD_CMD \
     --root="$ROOT_DEV_DIR" --root-deps=rdeps \
     --usepkgonly chromeos-test $EMERGE_JOBS
 }
 
 
 install_autotest() {
     SYSROOT="${FLAGS_build_root}/${FLAGS_board}"
     AUTOTEST_SRC="${SYSROOT}/usr/local/autotest"
     stateful_root="${ROOT_FS_DIR}/usr/local"
     autotest_client="/autotest"
@@ skipping 94 matching lines @@
   bash
   popd
 fi
 
 cleanup
 
 print_time_elapsed
 
 trap - EXIT