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

Unified Diff: src/scripts/mod_image_for_test.sh

Issue 2108010: Do not emerge chromeos-test in factory_install. (Closed) Base URL: http://src.chromium.org/git/chromiumos.git
Patch Set: Fix after Nick's comments. 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/mod_image_for_test.sh
diff --git a/src/scripts/mod_image_for_test.sh b/src/scripts/mod_image_for_test.sh
index ddf060c7afe110275e91265e0c7dad414ffbca40..53907eb6b6d5786daf49a7b457b4f4b20fc86589 100755
--- a/src/scripts/mod_image_for_test.sh
+++ b/src/scripts/mod_image_for_test.sh
@@ -119,22 +119,10 @@ trap cleanup EXIT
"$SCRIPTS_DIR/mount_gpt_image.sh" -i "$IMAGE_NAME" -f "$IMAGE_DIR" \
-r "$ROOT_FS_DIR" -s "$STATEFUL_DIR"
-emerge_chromeos_test
-
-MOD_TEST_ROOT="${GCLIENT_ROOT}/src/scripts/mod_for_test_scripts"
-# Run test setup script to modify the image
-sudo GCLIENT_ROOT="${GCLIENT_ROOT}" ROOT_FS_DIR="${ROOT_FS_DIR}" \
- "${MOD_TEST_ROOT}/test_setup.sh"
-
-if [ ${FLAGS_factory} -eq ${FLAGS_TRUE} ]; then
- MOD_FACTORY_ROOT="${GCLIENT_ROOT}/src/scripts/mod_for_factory_scripts"
- # Run factory setup script to modify the image
- sudo GCLIENT_ROOT="${GCLIENT_ROOT}" ROOT_FS_DIR="${ROOT_FS_DIR}" \
- STATEFUL_DIR="${STATEFUL_DIR}/dev_image" QUALDB="${FLAGS_qualdb}" \
- "${MOD_FACTORY_ROOT}/factory_setup.sh"
-fi
-
if [ ${FLAGS_factory_install} -eq ${FLAGS_TRUE} ]; then
+ # We don't want to emerge test packages on factory install, otherwise we run
+ # out of space.
+
# Run factory setup script to modify the image.
sudo emerge-${FLAGS_board} --root=$ROOT_FS_DIR --usepkgonly \
--root-deps=rdeps chromeos-factoryinstall
@@ -146,6 +134,21 @@ if [ ${FLAGS_factory_install} -eq ${FLAGS_TRUE} ]; then
http:\/\/${FACTORY_SERVER}:8080\/update/" \
${ROOT_FS_DIR}/etc/lsb-release
fi
+else
+ emerge_chromeos_test
+
+ MOD_TEST_ROOT="${GCLIENT_ROOT}/src/scripts/mod_for_test_scripts"
+ # Run test setup script to modify the image
+ sudo GCLIENT_ROOT="${GCLIENT_ROOT}" ROOT_FS_DIR="${ROOT_FS_DIR}" \
+ "${MOD_TEST_ROOT}/test_setup.sh"
+
+ if [ ${FLAGS_factory} -eq ${FLAGS_TRUE} ]; then
+ MOD_FACTORY_ROOT="${GCLIENT_ROOT}/src/scripts/mod_for_factory_scripts"
+ # Run factory setup script to modify the image
+ sudo GCLIENT_ROOT="${GCLIENT_ROOT}" ROOT_FS_DIR="${ROOT_FS_DIR}" \
+ STATEFUL_DIR="${STATEFUL_DIR}/dev_image" QUALDB="${FLAGS_qualdb}" \
+ "${MOD_FACTORY_ROOT}/factory_setup.sh"
+ fi
fi
cleanup
« 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