Update factory installer, factory test

src/scripts/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.
 . "$(dirname "$0")/common.sh"
 
 # Load functions and constants for chromeos-install
 . "$(dirname "$0")/chromeos-common.sh"
 
 # We need to be in the chroot to emerge test packages.
 assert_inside_chroot
 
 get_default_board
 
 DEFINE_string board "$DEFAULT_BOARD" "Board for which the image was built" b
 DEFINE_boolean factory $FLAGS_FALSE \
-  "Modify the image for manufacturing testing" f
+    "Modify the image for manufacturing testing" f
 DEFINE_boolean factory_install $FLAGS_FALSE \
     "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
+    "Use INSTALL_MASK to shrink the resulting image." m
 DEFINE_integer jobs -1 \
-  "How many packages to build in parallel at maximum." j
+    "How many packages to build in parallel at maximum." j
 DEFINE_string qualdb "/tmp/run_remote_tests.*" \
     "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."
+
 
 # Parse command line
 FLAGS "$@" || exit 1
 eval set -- "${FLAGS_ARGV}"
 
 # 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
@@ skipping 40 matching lines @@
   fi
 
   # Determine the root dir for test packages.
   ROOT_DEV_DIR="$ROOT_FS_DIR/usr/local"
 
   INSTALL_MASK="$INSTALL_MASK" emerge-${FLAGS_board} \
     --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"
+
+    echo "Install autotest into stateful partition from $AUTOTEST_SRC"
+
+    sudo mkdir -p "${stateful_root}${autotest_client}"
+    sudo mkdir -p "/tmp/autotest"
+    sudo rm -rf /tmp/autotest/*
+
+    sudo cp -fpru ${AUTOTEST_SRC}/client/* \
+      "/tmp/autotest"
+    # Remove outrageously large tests.
+    # TODO(nsanders): is there a better way to do this?
+    sudo rm -rf /tmp/autotest/deps/realtimecomm_playground
+    sudo rm -rf /tmp/autotest/tests/ltp
+    sudo rm -rf /tmp/autotest/site_tests/graphics_O3DSelenium
+    sudo rm -rf /tmp/autotest/realtimecomm_GTalk*
+    sudo rm -rf /tmp/autotest/site_tests/platform_StackProtector
+
+    sudo cp -fpru /tmp/autotest/* \
+      "${stateful_root}/${autotest_client}"
+    sudo chmod 755 "${stateful_root}/${autotest_client}"
+    sudo chown -R 1000:1000 "${stateful_root}/${autotest_client}"
+}
+
 # main process begins here.
 
 # Make sure this is really what the user wants, before nuking the device
 if [ $FLAGS_yes -ne $FLAGS_TRUE ]; then
   read -p "Modifying image ${FLAGS_image} for test; are you sure (y/N)? " SURE
   SURE="${SURE:0:1}" # Get just the first character
   if [ "$SURE" != "y" ]; then
     echo "Ok, better safe than sorry."
     exit 1
   fi
@@ skipping 14 matching lines @@
 # 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"
 
 if [ ${FLAGS_factory_install} -eq ${FLAGS_TRUE} ]; then
   # We don't want to emerge test packages on factory install, otherwise we run
   # out of space.
 
   # Run factory setup script to modify the image.
   sudo emerge-${FLAGS_board} --root=$ROOT_FS_DIR --usepkgonly \
-      --root-deps=rdeps chromeos-factoryinstall
+      --root-deps=rdeps --nodeps chromeos-factoryinstall
 
   # Set factory server if necessary.
   if [ "${FACTORY_SERVER}" != "" ]; then
     sudo sed -i \
       "s/CHROMEOS_AUSERVER=.*$/CHROMEOS_AUSERVER=\
 http:\/\/${FACTORY_SERVER}:8080\/update/" \
       ${ROOT_FS_DIR}/etc/lsb-release
   fi
 else
   emerge_chromeos_test
 
   MOD_TEST_ROOT="${GCLIENT_ROOT}/src/scripts/mod_for_test_scripts"
   # Run test setup script to modify the image
   sudo GCLIENT_ROOT="${GCLIENT_ROOT}" ROOT_FS_DIR="${ROOT_FS_DIR}" \
       "${MOD_TEST_ROOT}/test_setup.sh"
 
   if [ ${FLAGS_factory} -eq ${FLAGS_TRUE} ]; then
+    install_autotest
+
     MOD_FACTORY_ROOT="${GCLIENT_ROOT}/src/scripts/mod_for_factory_scripts"
     # Run factory setup script to modify the image
     sudo GCLIENT_ROOT="${GCLIENT_ROOT}" ROOT_FS_DIR="${ROOT_FS_DIR}" \
-        STATEFUL_DIR="${STATEFUL_DIR}/dev_image" QUALDB="${FLAGS_qualdb}" \
+        QUALDB="${FLAGS_qualdb}" \
         "${MOD_FACTORY_ROOT}/factory_setup.sh"
   fi
 fi
 
+# Let's have a look at the image just in case..
+if [ "${VERIFY}" = "true" ]; then
+  pushd "${ROOT_FS_DIR}"
+  bash
+  popd
+fi
+
 cleanup
 trap - EXIT