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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 # 5 #
6 # Bash functions used by buildbot annotator scripts for the android 6 # Bash functions used by buildbot annotator scripts for the android
7 # build of chromium. Executing this script should not perform actions 7 # build of chromium. Executing this script should not perform actions
8 # other than setting variables and defining of functions. 8 # other than setting variables and defining of functions.
9 9
10 # Number of jobs on the compile line; e.g. make -j"${JOBS}" 10 # Number of jobs on the compile line; e.g. make -j"${JOBS}"
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 --build-properties "$BUILD_PROPERTIES" 259 --build-properties "$BUILD_PROPERTIES"
260 } 260 }
261 261
262 # Download and extract a build. 262 # Download and extract a build.
263 function bb_extract_build { 263 function bb_extract_build {
264 echo "@@@BUILD_STEP Download and extract build@@@" 264 echo "@@@BUILD_STEP Download and extract build@@@"
265 if [[ -z $FACTORY_PROPERTIES || -z $BUILD_PROPERTIES ]]; then 265 if [[ -z $FACTORY_PROPERTIES || -z $BUILD_PROPERTIES ]]; then
266 return 1 266 return 1
267 fi 267 fi
268 268
269 # When extract_build.py downloads an unversioned build it
270 # issues a warning by exiting with large numbered return code
271 # When it fails to download it build, it exits with return
272 # code 1. We disable halt on error mode and return normally
273 # unless the python tool returns 1.
274 (
275 set +e
269 python ../../../../scripts/slave/extract_build.py \ 276 python ../../../../scripts/slave/extract_build.py \
270 --build-dir "$SRC_ROOT" \ 277 --build-dir "$SRC_ROOT" \
271 --build-output-dir "out" \ 278 --build-output-dir "out" \
272 --target Release \ 279 --target Release \
273 --factory-properties "$FACTORY_PROPERTIES" \ 280 --factory-properties "$FACTORY_PROPERTIES" \
274 --build-properties "$BUILD_PROPERTIES" 281 --build-properties "$BUILD_PROPERTIES"
282 extract_exitcode=$?
283 if (( $extract_exitcode > 1 )); then
284 echo "@@@STEP_WARNINGS@@@"
285 return
286 fi
287 return $extract_exitcode
288 )
275 } 289 }
OLDNEW
« 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