Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

Unified Diff: src/scripts/archive_build.sh

Issue 2008001: Only allows mod_image_for_test for default from behavior. (Closed) Base URL: ssh://git@chromiumos-git//chromeos
Patch Set: Remove image_to_usb changes. Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/scripts/archive_build.sh
diff --git a/src/scripts/archive_build.sh b/src/scripts/archive_build.sh
index 27648211f6fe5b4e1cc78990d7957960b5744229..d050fd52ca8fb304ad17dc2b12ef5d119cce25f8 100755
--- a/src/scripts/archive_build.sh
+++ b/src/scripts/archive_build.sh
@@ -38,16 +38,28 @@ DEFINE_boolean test_mod $FLAGS_TRUE "Modify image for testing purposes"
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..."
@@ -94,10 +106,10 @@ 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698