Only mod image for test if necessary

src/scripts/image_to_usb.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 convert the output of build_image.sh to a usb image.
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
@@ skipping 30 matching lines @@
   SYSROOT="${FLAGS_build_root}/${FLAGS_board}"
 else
   SYSROOT="${DEFAULT_CHROOT_DIR}${FLAGS_build_root}/${FLAGS_board}"
 fi
 AUTOTEST_SRC="${SYSROOT}/usr/local/autotest"
 
 # Die on any errors.
 set -e
 
 # No board, no default and no image set then we can't find the image
-if [ -z ${FLAGS_from} ] && [ -z ${FLAGS_board} ] ; then 
+if [ -z ${FLAGS_from} ] && [ -z ${FLAGS_board} ] ; then
   setup_board_warning
   exit 1
 fi
 
 # We have a board name but no image set.  Use image at default location
 if [ -z "${FLAGS_from}" ]; then
   IMAGES_DIR="${DEFAULT_BUILD_ROOT}/images/${FLAGS_board}"
   FLAGS_from="${IMAGES_DIR}/$(ls -t ${IMAGES_DIR} 2>&-| head -1)"
 fi
 
@@ skipping 21 matching lines @@
 # chars like ~ are processed; just doing FOO=`readlink -f ${FOO}` won't work.
 FLAGS_from=`eval readlink -f ${FLAGS_from}`
 FLAGS_to=`eval readlink -f ${FLAGS_to}`
 
 # Use this image as the source image to copy
 SRC_IMAGE="${FLAGS_from}/chromiumos_image.bin"
 
 # If we're asked to modify the image for test, then let's make a copy and
 # modify that instead.
 if [ ${FLAGS_test_image} -eq ${FLAGS_TRUE} ] ; then
-  # Copy it.
-  echo "Creating test image from original..."
-  cp -f "${SRC_IMAGE}" "${FLAGS_from}/chromiumos_test_image.bin"
+  if [ ! -f "${FLAGS_from}/chromiumos_test_image.bin" ] ; then
+    # Copy it.
+    echo "Creating test image from original..."
+    cp -f "${SRC_IMAGE}" "${FLAGS_from}/chromiumos_test_image.bin"
+    # Modify it.
+    "${SCRIPTS_DIR}/mod_image_for_test.sh" --image \
+      "${FLAGS_from}/chromiumos_test_image.bin"
+  fi
   # Use it.
   SRC_IMAGE="${FLAGS_from}/chromiumos_test_image.bin"
-  # Modify it.
-  "${SCRIPTS_DIR}/mod_image_for_test.sh" --image "${SRC_IMAGE}"
 fi
 
 STATEFUL_DIR="${FLAGS_from}/stateful_partition"
 mkdir -p "${STATEFUL_DIR}"
 
 function do_cleanup {
   echo "Cleaning loopback devices: ${STATEFUL_LOOP_DEV}"
   if [ "${STATEFUL_LOOP_DEV}" != "" ]; then
     sudo umount "${STATEFUL_DIR}"
     sudo losetup -d "${STATEFUL_LOOP_DEV}"
@@ skipping 22 matching lines @@
     echo "Mounting ${STATEFUL_DIR} loopback"
     sudo losetup -o $(( $offset * 512 )) "${stateful_loop_dev}" "${SRC_IMAGE}"
     sudo mount "${stateful_loop_dev}" "${STATEFUL_DIR}"
     stateful_root="${STATEFUL_DIR}/dev_image"
 
     echo "Install autotest into stateful partition..."
     autotest_client="/home/autotest-client"
     sudo mkdir -p "${stateful_root}${autotest_client}"
 
     sudo cp -fpru ${AUTOTEST_SRC}/client/* \
-            "${stateful_root}/${autotest_client}"
+      "${stateful_root}/${autotest_client}"
     sudo chmod 755 "${stateful_root}/${autotest_client}"
     sudo chown -R 1000:1000 "${stateful_root}/${autotest_client}"
-    
+
     sudo umount ${STATEFUL_DIR}
     sudo losetup -d "${stateful_loop_dev}"
     trap - INT TERM EXIT
     rmdir "${STATEFUL_DIR}"
   else
     echo "/usr/local/autotest under ${DEFAULT_CHROOT_DIR} is not installed."
     echo "Please call make_autotest.sh inside chroot first."
     exit -1
   fi
 fi
@@ skipping 51 matching lines @@
   echo "   sudo dd if=${FLAGS_to} of=/dev/sdb bs=4M"
   echo "where /dev/sdb is the entire keyfob."
   if [ ${INSIDE_CHROOT} -eq 1 ]
   then
     example=$(basename "${FLAGS_to}")
     echo "NOTE: Since you are currently inside the chroot, and you'll need to"
     echo "run dd outside the chroot, the path to the USB image will be"
     echo "different (ex: ~/chromeos/trunk/src/build/images/SOME_DIR/$example)."
   fi
 fi