Chromium Code Reviews| Index: build/android/buildbot/buildbot_functions.sh |
| diff --git a/build/android/buildbot/buildbot_functions.sh b/build/android/buildbot/buildbot_functions.sh |
| index 3a4ca9a7c24316035037e0a85e515ad0c1665308..afc973ba146f8da750d6d6f0f5c55eaac1ce59e6 100755 |
| --- a/build/android/buildbot/buildbot_functions.sh |
| +++ b/build/android/buildbot/buildbot_functions.sh |
| @@ -260,16 +260,21 @@ function bb_extract_build { |
| } |
| # Runs the license checker for the WebView build. |
| +# License checker may return error code 1 meaning that |
| +# there are non-fatal problems (warnings). Everything |
| +# above 1 is considered to be a show-stopper. |
| function bb_check_webview_licenses { |
| echo "@@@BUILD_STEP Check licenses for WebView@@@" |
| ( |
| set +e |
| cd "${SRC_ROOT}" |
| python android_webview/tools/webview_licenses.py scan |
| - if [[ $? -ne 0 ]]; then |
| + local licenses_exit_code=$? |
| + if [[ $licenses_exit_code -eq 1 ]]; then |
| echo "@@@STEP_WARNINGS@@@" |
| + return 0 |
| fi |
| - return 0 |
| + return $licenses_exit_code |
|
Isaac (away)
2013/02/07 12:08:47
This syntax will not work - the bot while halt if
mnaganov (inactive)
2013/02/07 13:48:52
Thanks for pointing this out, Isaac! I think I can
|
| ) |
| } |