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

Unified Diff: build/android/buildbot_functions.sh

Issue 10629011: Disable set -e for extract build step (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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: build/android/buildbot_functions.sh
diff --git a/build/android/buildbot_functions.sh b/build/android/buildbot_functions.sh
index 42d63c2280005e3cc5930b64196ec0ae8b56215d..b38f96980b0f92975caef619e4c9b2ab5b560d72 100755
--- a/build/android/buildbot_functions.sh
+++ b/build/android/buildbot_functions.sh
@@ -266,10 +266,20 @@ function bb_extract_build {
return 1
fi
+ # extract_build issues warnings with return code above 1
+ (
+ set +x
python ../../../../scripts/slave/extract_build.py \
--build-dir "$SRC_ROOT" \
--build-output-dir "out" \
--target Release \
--factory-properties "$FACTORY_PROPERTIES" \
--build-properties "$BUILD_PROPERTIES"
+ extract_exitcode=$?
+ if (( $extract_exitcode > 1 )); then
newt (away) 2012/06/22 00:40:19 Are you intentionally ignoring an error code of 1?
+ echo "@@@STEP_WARNINGS@@@"
+ return
+ fi
+ return $extract_exitcode
+ )
}
« 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