Index: scripts/slave/recipes/libyuv/libyuv.py |
diff --git a/scripts/slave/recipes/libyuv/libyuv.py b/scripts/slave/recipes/libyuv/libyuv.py |
index 9db26c621d20a44b342fb402b15e5ab8aec23223..74ffb303c2ab82805d74727d3549130527a27e4f 100644 |
--- a/scripts/slave/recipes/libyuv/libyuv.py |
+++ b/scripts/slave/recipes/libyuv/libyuv.py |
@@ -10,6 +10,7 @@ from recipe_engine.types import freeze |
DEPS = [ |
'chromium', |
+ 'chromium_android', |
'depot_tools/bot_update', |
'depot_tools/gclient', |
'depot_tools/tryserver', |
@@ -20,13 +21,15 @@ DEPS = [ |
'recipe_engine/step', |
] |
+ |
def RunSteps(api): |
libyuv = api.libyuv |
libyuv.apply_bot_config(libyuv.BUILDERS, libyuv.RECIPE_CONFIGS) |
- api.bot_update.ensure_checkout() |
api.chromium.cleanup_temp() |
- api.chromium.ensure_goma() |
+ libyuv.checkout() |
+ if libyuv.should_build: |
+ api.chromium.ensure_goma() |
api.chromium.runhooks() |
if libyuv.should_build: |
@@ -35,10 +38,16 @@ def RunSteps(api): |
api.chromium.compile(targets=['all']) |
else: |
api.chromium.compile() |
+ if libyuv.should_upload_build: |
+ libyuv.package_build() |
+ |
+ if libyuv.should_download_build: |
+ libyuv.extract_build() |
if libyuv.should_test: |
- api.chromium.runtest('libyuv_unittest') |
+ libyuv.runtests() |
+ libyuv.maybe_trigger() |
def _sanitize_nonalpha(text): |
return ''.join(c if c.isalnum() else '_' for c in text.lower()) |
@@ -50,6 +59,7 @@ def GenTests(api): |
def generate_builder(mastername, buildername, revision, suffix=None): |
suffix = suffix or '' |
bot_config = builders[mastername]['builders'][buildername] |
+ bot_type = bot_config.get('bot_type', 'builder_tester') |
chromium_kwargs = bot_config.get('chromium_config_kwargs', {}) |
test = ( |
@@ -63,17 +73,24 @@ def GenTests(api): |
chromium_kwargs.get('TARGET_BITS', 64)) |
) |
+ if bot_config.get('parent_buildername'): |
+ test += api.properties( |
+ parent_buildername=bot_config['parent_buildername']) |
+ |
if revision: |
test += api.properties(revision=revision) |
+ if bot_type == 'tester': |
+ test += api.properties(parent_got_revision=revision) |
if mastername.startswith('tryserver'): |
test += api.properties(issue='123456789', patchset='1', |
rietveld='https://rietveld.example.com') |
+ test += api.properties(buildnumber=1337) |
return test |
for mastername, master_config in builders.iteritems(): |
for buildername in master_config['builders'].keys(): |
- yield generate_builder(mastername, buildername, revision='12345') |
+ yield generate_builder(mastername, buildername, revision='deadbeef') |
# Forced builds (not specifying any revision) and test failures. |
mastername = 'client.libyuv' |
@@ -81,6 +98,8 @@ def GenTests(api): |
suffix='_forced') |
yield generate_builder(mastername, 'Android Debug', revision=None, |
suffix='_forced') |
+ yield generate_builder(mastername, 'Android Tester ARM32 Debug (Nexus 5X)', |
+ revision=None, suffix='_forced_invalid') |
yield generate_builder('tryserver.libyuv', 'linux', revision=None, |
suffix='_forced') |