Only allows mod_image_for_test for default from behavior.

src/scripts/archive_build.sh

 #!/bin/bash
 
 # 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.
 
 # Script to archive build results.  Used by the buildbots.
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
@@ skipping 20 matching lines @@
 DEFINE_string zipname "image.zip" "Name of zip file to create."
 DEFINE_boolean official_build $FLAGS_FALSE "Set CHROMEOS_OFFICIAL=1 for release builds."
 DEFINE_string build_number "" \
   "The build-bot build number (when called by buildbot only)." "b"
 DEFINE_boolean test_mod $FLAGS_TRUE "Modify image for testing purposes"
 
 # Parse command line
 FLAGS "$@" || exit 1
 eval set -- "${FLAGS_ARGV}"
 
+# Set if default from path is used
+DEFAULT_USED=
+
 # Reset "default" FLAGS_from based on passed-in board if not set on cmd-line
 if [ "$FLAGS_from" = "$DEFAULT_FROM" ]
 then
-   FLAGS_from="${IMAGES_DIR}/$FLAGS_board/$(ls -t1 \
-               $IMAGES_DIR/$FLAGS_board 2>&-| head -1)"
+  FLAGS_from="${IMAGES_DIR}/$FLAGS_board/$(ls -t1 \
+              $IMAGES_DIR/$FLAGS_board 2>&-| head -1)"
+  DEFAULT_USED=1
 fi
 
 # Die on any errors.
 set -e
 
+if [ -z $DEFAULT_USED ] && [ $FLAGS_test_mod -eq $FLAGS_TRUE ]
+then
+  echo "test_mod requires that the default from path be used."
+  echo "If non default behavior is desired, run mod_image_for_test manually"
+  echo "re-run archive build without test_mod"
+  exit 1
+fi
+
 if [ ! -d "$FLAGS_from" ]
 then
    echo "$FLAGS_from does not exist.  Exiting..."
    exit 1
 fi
 
 if [ $FLAGS_official_build -eq $FLAGS_TRUE ]
 then
    CHROMEOS_OFFICIAL=1
 fi
@@ skipping 26 matching lines @@
 echo "archive to file: $ZIPFILE"
 
 rm -rf "$OUTDIR"
 mkdir -p "$OUTDIR"
 
 # Modify image for test if flag set.
 if [ $FLAGS_test_mod -eq $FLAGS_TRUE ]
 then
   echo "Modifying image for test"
   SRC_IMAGE="${FLAGS_from}/chromiumos_image.bin"
-  cp -f "${SRC_IMAGE}" "${FLAGS_from}/chromiumos_test_image.bin"
-  SRC_IMAGE="${FLAGS_from}/chromiumos_test_image.bin"
-  "${SCRIPTS_DIR}/mod_image_for_test.sh" --board $FLAGS_board --yes --image \
-      "${SRC_IMAGE}"
+  cp -f "${SRC_IMAGE}" "${FLAGS_from}/chromiumos_image_bkup.bin"
+  ./enter_chroot.sh -- ./mod_image_for_test.sh --board $FLAGS_board --yes
+  mv "$SRC_IMAGE" "${FLAGS_from}/chromiumos_test_image.bin"
+  mv "${FLAGS_from}/chromiumos_image_bkup.bin" "$SRC_IMAGE"
   cd "${FLAGS_chroot}/build/${FLAGS_board}/usr/local"
   echo "Archiving autotest build artifacts"
   tar cjf "${FLAGS_from}/autotest.tar.bz2" autotest
 fi
 
 # Zip the build
 echo "Compressing and archiving build..."
 cd "$FLAGS_from"
 zip -r "$ZIPFILE" *
 cd -
@@ skipping 17 matching lines @@
 if [ $FLAGS_keep_max -gt 0 ]
 then
   echo "Deleting old builds (all but the newest ${FLAGS_keep_max})..."
   cd "$FLAGS_to"
   # +2 because line numbers start at 1 and need to skip LATEST file
   rm -rf `ls -t1 | tail --lines=+$(($FLAGS_keep_max + 2))`
   cd -
 fi
 
 echo "Done."