summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Pranke <dpranke@chromium.org>2015-04-14 16:15:32 -0700
committerDirk Pranke <dpranke@chromium.org>2015-04-14 23:16:24 +0000
commit12ee2db8ba9a6e8fc49100d7898ef944babd6c91 (patch)
treead4a5cc7850ec3fa2930538f73b29870c2b5b856
parent907fe612f5949ef8a6c2fe3bd00ddd1c423f9f20 (diff)
downloadchromium_src-12ee2db8ba9a6e8fc49100d7898ef944babd6c91.zip
chromium_src-12ee2db8ba9a6e8fc49100d7898ef944babd6c91.tar.gz
chromium_src-12ee2db8ba9a6e8fc49100d7898ef944babd6c91.tar.bz2
mb fixes: fix uninitialized return value on empty file list
and add bot entries for the chromium.webkit GN bots. TBR=japhet@chromium.org BUG= Review URL: https://codereview.chromium.org/1082393002 Cr-Commit-Position: refs/heads/master@{#325146}
-rwxr-xr-xtools/mb/mb.py1
-rw-r--r--tools/mb/mb_config.pyl6
2 files changed, 7 insertions, 0 deletions
diff --git a/tools/mb/mb.py b/tools/mb/mb.py
index 2a9941b..0834d55 100755
--- a/tools/mb/mb.py
+++ b/tools/mb/mb.py
@@ -417,6 +417,7 @@ class MetaBuildWrapper(object):
return 0
all_needed_targets = set()
+ ret = 0
for f in inp['files']:
cmd = self.GNCmd('refs', self.args.path[0]) + [
'//' + f, '--type=executable', '--all', '--as=output']
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index e9a28ec..847b6a59 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -146,6 +146,12 @@
'Win8 GN': 'gn_release_bot',
'Win8 GN (dbg)': 'gn_debug_bot',
},
+ 'chromium.webkit': {
+ 'Android GN': 'gn_release_bot',
+ 'Android GN (dbg)': 'gn_debug_bot',
+ 'Linux GN': 'gn_release_bot',
+ 'Linux GN (dbg)': 'gn_debug_bot'
+ },
'tryserver.chromium.linux': {
'android_chromium_gn_compile_dbg': 'android_gn_debug_bot',
'android_chromium_gn_compile_rel': 'android_gn_release_trybot',