Skip dropping caches in each test and between iterations during factory tests.

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 72 matching lines @@
 fi
 
 # Convert args to paths.  Need eval to un-quote the string so that shell
 # 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
-  if [ ! -f "${FLAGS_from}/chromiumos_test_image.bin" ] || \
-     [ ${FLAGS_force_copy} -eq ${FLAGS_TRUE} ] ; then
-    # Copy it.
-    echo "Creating test image from original..."
-    cp -f "${SRC_IMAGE}" "${FLAGS_from}/chromiumos_test_image.bin"
-
-    # Check for manufacturing image.
-    if [ ${FLAGS_factory} -eq ${FLAGS_TRUE} ] ; then
-      FACTORY_ARGS="--factory"
-    fi
-
-    # Modify it.  Pass --yes so that mod_image_for_test.sh won't ask us if we
-    # really want to modify the image; the user gave their assent already with
-    # --test-image and the original image is going to be preserved.
-    "${SCRIPTS_DIR}/mod_image_for_test.sh" --image \
-      "${FLAGS_from}/chromiumos_test_image.bin" ${FACTORY_ARGS} --yes
-    echo "Done with mod_image_for_test."
-  else
-    echo "Using cached test image."
-  fi
-  SRC_IMAGE="${FLAGS_from}/chromiumos_test_image.bin"
-  echo "Source test image is: ${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}"
     rmdir "${STATEFUL_DIR}"
     echo "Cleaned"
@@ skipping 38 matching lines @@
     trap - INT TERM EXIT
     rmdir "${STATEFUL_DIR}"
   else
     echo "/usr/local/autotest under ${DEFAULT_CHROOT_DIR} is not installed."
     echo "Please call build_autotest.sh inside chroot first."
     exit -1
   fi
 fi
 
 
+# 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
+  if [ ! -f "${FLAGS_from}/chromiumos_test_image.bin" ] || \
+     [ ${FLAGS_force_copy} -eq ${FLAGS_TRUE} ] ; then
+    # Copy it.
+    echo "Creating test image from original..."
+    cp -f "${SRC_IMAGE}" "${FLAGS_from}/chromiumos_test_image.bin"
+
+    # Check for manufacturing image.
+    if [ ${FLAGS_factory} -eq ${FLAGS_TRUE} ] ; then
+      FACTORY_ARGS="--factory"
+    fi
+
+    # Modify it.  Pass --yes so that mod_image_for_test.sh won't ask us if we
+    # really want to modify the image; the user gave their assent already with
+    # --test-image and the original image is going to be preserved.
+    "${SCRIPTS_DIR}/mod_image_for_test.sh" --image \
+      "${FLAGS_from}/chromiumos_test_image.bin" ${FACTORY_ARGS} --yes
+    echo "Done with mod_image_for_test."
+  else
+    echo "Using cached test image."
+  fi
+  SRC_IMAGE="${FLAGS_from}/chromiumos_test_image.bin"
+  echo "Source test image is: ${SRC_IMAGE}"
+fi
+
+
 # Let's do it.
 if [ -b "${FLAGS_to}" ]
 then
   # Output to a block device (i.e., a real USB key), so need sudo dd
   echo "Copying USB image ${SRC_IMAGE} to device ${FLAGS_to}..."
 
   # Warn if it looks like they supplied a partition as the destination.
   if echo "${FLAGS_to}" | grep -q '[0-9]$'; then
     drive=$(echo "${FLAGS_to}" | sed -re 's/[0-9]+$//')
     if [ -b "${drive}" ]; then
@@ skipping 39 matching lines @@
   echo "   sudo dd if=${FLAGS_to} of=/dev/sdX bs=4M"
   echo "where /dev/sdX is the entire drive."
   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