summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-06 20:52:32 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-06 20:52:32 +0000
commite6fc7b45877afd0ca10d139f936af8caf529b3c0 (patch)
tree79d8af543bb904eed7e3cec42d688d039fccb6c9
parent33eb0ccc628c6b2ef3f0adb168c83336899900af (diff)
downloadchromium_src-e6fc7b45877afd0ca10d139f936af8caf529b3c0.zip
chromium_src-e6fc7b45877afd0ca10d139f936af8caf529b3c0.tar.gz
chromium_src-e6fc7b45877afd0ca10d139f936af8caf529b3c0.tar.bz2
Mojo: Make mojob.sh die if sync or gyp fails.
R=sky@chromium.org Review URL: https://codereview.chromium.org/186663009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255423 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xmojo/tools/mojob.sh10
1 files changed, 7 insertions, 3 deletions
diff --git a/mojo/tools/mojob.sh b/mojo/tools/mojob.sh
index dc4013a..81c4466 100755
--- a/mojo/tools/mojob.sh
+++ b/mojo/tools/mojob.sh
@@ -65,7 +65,12 @@ do_perftests() {
do_gyp() {
local gyp_defines="$(make_gyp_defines)"
echo "Running gyp with GYP_DEFINES=$gyp_defines ..."
- GYP_DEFINES="$gyp_defines" build/gyp_chromium mojo/mojo.gyp
+ GYP_DEFINES="$gyp_defines" build/gyp_chromium mojo/mojo.gyp || exit 1
+}
+
+do_sync() {
+ # Note: sync only (with hooks, but no gyp-ing).
+ GYP_CHROMIUM_NO_ACTION=1 gclient sync || exit 1
}
# Valid values: Debug, Release, or Debug_and_Release.
@@ -135,8 +140,7 @@ for arg in "$@"; do
do_gyp
;;
sync)
- # Note: sync only (with hooks, but no gyp-ing).
- GYP_CHROMIUM_NO_ACTION=1 gclient sync
+ do_sync
;;
show-bash-alias)
# You want to type something like: