Update mod_image_for_test to use the new factorytest-init package

mod_image_for_test.sh

 #!/bin/bash
 
-# Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
+# Copyright (c) 2011 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.
 
 # --- BEGIN COMMON.SH BOILERPLATE ---
 # Load common CrOS utilities.  Inside the chroot this file is installed in
 # /usr/lib/crosutils.  Outside the chroot we find it relative to the script's
 # location.
 find_common_sh() {
@@ skipping 207 matching lines @@
 STATEFUL_DIR="$IMAGE_DIR/stateful_partition"
 
 trap cleanup EXIT
 
 # Mounts gpt image and sets up var, /usr/local and symlinks.
 "$SCRIPTS_DIR/mount_gpt_image.sh" -i "$IMAGE_NAME" -f "$IMAGE_DIR" \
   -r "$ROOT_FS_DIR" -s "$STATEFUL_DIR"
 
 emerge_chromeos_test
 
-MOD_TEST_ROOT="${GCLIENT_ROOT}/src/scripts/mod_for_test_scripts"
+MOD_TEST_SCRIPT="${SCRIPTS_DIR}/mod_for_test_scripts/test_setup.sh"
 # Run test setup script to modify the image
 sudo GCLIENT_ROOT="${GCLIENT_ROOT}" ROOT_FS_DIR="${ROOT_FS_DIR}" \
-    STATEFUL_DIR="${STATEFUL_DIR}" ARCH="${ARCH}" "${MOD_TEST_ROOT}/test_setup.sh"
+    STATEFUL_DIR="${STATEFUL_DIR}" ARCH="${ARCH}" "${MOD_TEST_SCRIPT}"
 
 if [ ${FLAGS_factory} -eq ${FLAGS_TRUE} ]; then
+  sudo INSTALL_MASK="$INSTALL_MASK" $EMERGE_BOARD_CMD \
+    --root="$ROOT_FS_DIR" --root-deps=rdeps \
+    factorytest-init $EMERGE_JOBS

[Vince Laviano, 2011/03/18 02:45:45]

Maybe use the "${FOO}" variable quoting style here for consistency with the rest
of the file.

[jrbarnette, 2011/03/18 20:31:48]

The rest of the file had no consistency, either...

I've uploaded changes to fix this style nit and a large raft of others.

+
   install_autotest
 
-  MOD_FACTORY_ROOT="${GCLIENT_ROOT}/src/scripts/mod_for_factory_scripts"
+  MOD_FACTORY_SCRIPT="${SCRIPTS_DIR}/mod_for_factory_scripts/factory_setup.sh"
   # Run factory setup script to modify the image
   sudo GCLIENT_ROOT="${GCLIENT_ROOT}" ROOT_FS_DIR="${ROOT_FS_DIR}" \
-      QUALDB="${FLAGS_qualdb}" BOARD=${FLAGS_board} \
-      "${MOD_FACTORY_ROOT}/factory_setup.sh"
+      QUALDB="${FLAGS_qualdb}" BOARD=${FLAGS_board} "${MOD_FACTORY_SCRIPT}"
 fi
 
 # Re-run ldconfig to fix /etc/ldconfig.so.cache.
 sudo /sbin/ldconfig -r "${ROOT_FS_DIR}"
 
 # Let's have a look at the image just in case..
 if [ "${VERIFY}" = "true" ]; then
   pushd "${ROOT_FS_DIR}"
   bash
   popd
 fi
 
 cleanup
 
 # Now make it bootable with the flags from build_image
 "${SCRIPTS_DIR}/bin/cros_make_image_bootable" "$(dirname "${FLAGS_image}")" \
                                             $(basename "${FLAGS_image}")
 
 print_time_elapsed
 
 trap - EXIT