diff options
| author |  borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-11 18:11:56 +0000 |
|---|---|---|
| committer | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-11 18:11:56 +0000 |
| commit | fa05719ce21a97e07567a9355eaed5c780ba5c09 (patch) | |
| tree | d52bd49463a1b7a762772d4e3bfdc6a7c3ed9c6f /platform_tools | |
| parent | 6dd1545ae9ff3ac10586144494f763bcc1bea1d8 (diff) | |
Make ChromeOS build exit nonzero on failure
R=djsollen@google.com
Review URL: https://codereview.chromium.org/18621004
git-svn-id: http://skia.googlecode.com/svn/trunk@10018 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/chromeos/bin/build_skia_in_chroot | 2 | ||||
| -rwxr-xr-x | platform_tools/chromeos/bin/chromeos_make | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/platform_tools/chromeos/bin/build_skia_in_chroot b/platform_tools/chromeos/bin/build_skia_in_chroot index b585d76a53..86f6d33841 100755 --- a/platform_tools/chromeos/bin/build_skia_in_chroot +++ b/platform_tools/chromeos/bin/build_skia_in_chroot @@ -38,3 +38,5 @@ if [ $returnVal != 0 ] then exit 1; fi + +echo > .cros_build_successful
\ No newline at end of file diff --git a/platform_tools/chromeos/bin/chromeos_make b/platform_tools/chromeos/bin/chromeos_make index 200f3df204..a1cb2ba6a3 100755 --- a/platform_tools/chromeos/bin/chromeos_make +++ b/platform_tools/chromeos/bin/chromeos_make @@ -68,13 +68,14 @@ SKIA_TOP_DIR="${SCRIPT_DIR}/../../.." pushd ${CHROMEOS_CHROOT} cros chrome-sdk --nogoma --board ${deviceID} --debug -- /bin/sh -c "cd ${SKIA_TOP_DIR}; platform_tools/chromeos/bin/build_skia_in_chroot ${makeVars}" -returnVal=$? popd > /dev/null # Clean up rm ${CHROMEOS_CHROOT}/.gclient -if [ "${returnVal}" != "0" ] -then - exit 1; +if [ -f .cros_build_successful ]; then + rm -rf .cros_build_successful + exit 0 fi + +exit 1
\ No newline at end of file |