Factored out the code to copy an image and modify it for test

common.sh

 # 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.
 
 # Common constants for build scripts
 # This must evaluate properly for both /bin/bash and /bin/sh
 
 # All scripts should die on error unless commands are specifically excepted
 # by prefixing with '!' or surrounded by 'set +e' / 'set -e'.
 # TODO: Re-enable this once shflags is less prone to dying.
 #set -e
 
 # The number of jobs to pass to tools that can run in parallel (such as make
 # and dpkg-buildpackage
 NUM_JOBS=$(grep -c "^processor" /proc/cpuinfo)
 
+# True if we have the 'pv' utility - also set up COMMON_PV_CAT for convenience
+COMMON_PV_OK=1
+COMMON_PV_CAT=pv
+pv -V >/dev/null 2>&1 || COMMON_PV_OK=0
+if [ $COMMON_PV_OK -eq 0 ]; then
+  COMMON_PV_CAT=cat
+fi
+
 # Make sure we have the location and name of the calling script, using
 # the current value if it is already set.
 SCRIPT_LOCATION=${SCRIPT_LOCATION:-$(dirname "$(readlink -f "$0")")}
 SCRIPT_NAME=${SCRIPT_NAME:-$(basename "$0")}
 
 # Detect whether we're inside a chroot or not
 if [ -e /etc/debian_chroot ]
 then
   INSIDE_CHROOT=1
 else
@@ skipping 111 matching lines @@
 fi
 # Strip CR
 ALL_BOARDS=$(echo $ALL_BOARDS)
 # Set a default BOARD
 #DEFAULT_BOARD=x86-generic # or...
 DEFAULT_BOARD=$(echo $ALL_BOARDS | awk '{print $NF}')
 
 # Enable --fast by default.
 DEFAULT_FAST=${FLAGS_TRUE}
 
+
+# Standard filenames
+CHROMEOS_IMAGE_NAME="chromiumos_image.bin"
+CHROMEOS_TEST_IMAGE_NAME="chromiumos_test_image.bin"
+
+
 # Directory locations inside the dev chroot
 CHROOT_TRUNK_DIR="/home/$USER/trunk"
 
 # Install make for portage ebuilds.  Used by build_image and gmergefs.
 # TODO: Is /usr/local/autotest-chrome still used by anyone?
 DEFAULT_INSTALL_MASK="
   *.a
   *.la
   /etc/init.d
   /etc/runlevels
@@ skipping 425 matching lines @@
 
   BOARD=$(echo "$flags_board" | cut -d '_' -f 1)
   VARIANT=${flags_variant:-$(echo "$flags_board" | cut -s -d '_' -f 2)}
 
   if [ -n "$VARIANT" ]; then
     BOARD_VARIANT="${BOARD}_${VARIANT}"
   else
     BOARD_VARIANT="${BOARD}"
   fi
 }
+
+# This function converts a chromiumos image into a test image, either
+# in place or by copying to a new test image filename first. It honors
+# the following flags (see mod_image_for_test.sh)
+#
+#   --factory
+#   --factory_install
+#   --force_copy
+#
+# On entry, pass the directory containing the image, and the image filename
+# On exit, it puts the pathname of the resulting test image into
+# CHROMEOS_RETURN_VAL
+# (yes this is ugly, but perhaps less ugly than the alternatives)
+#
+# Usage:
+#   SRC_IMAGE=$(prepare_test_image "directory" "imagefile")
+prepare_test_image() {
+  # If we're asked to modify the image for test, then let's make a copy and
+  # modify that instead.
+  # Check for manufacturing image.
+  local args
+
+  if [ ${FLAGS_factory} -eq ${FLAGS_TRUE} ]; then
+    args="--factory"
+  fi
+
+  # Check for install shim.
+  if [ ${FLAGS_factory_install} -eq ${FLAGS_TRUE} ]; then
+    args="--factory_install"
+  fi
+
+  # Check for forcing copy of image
+  if [ ${FLAGS_force_copy} -eq ${FLAGS_TRUE} ]; then
+    args="${args} --force_copy"
+  fi
+
+  # Modify the image for test, creating a new test image
+  "${SCRIPTS_DIR}/mod_image_for_test.sh" --board=${FLAGS_board} \
+    --image="$1/$2" --noinplace ${args}
+
+  # From now on we use the just-created test image
+  CHROMEOS_RETURN_VAL="$1/${CHROMEOS_TEST_IMAGE_NAME}"
+}