Index: scripts/slave/recipes/libyuv/libyuv.py |
diff --git a/scripts/slave/recipes/libyuv/libyuv.py b/scripts/slave/recipes/libyuv/libyuv.py |
index 5e7b3dd1e41bb953dd1e9d773f32be25c509e754..0697c34f6e4fb2ad960ecb8acb95ba980661cb92 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,11 +21,12 @@ DEPS = [ |
'recipe_engine/step', |
] |
+ |
def RunSteps(api): |
libyuv = api.libyuv |
libyuv.apply_bot_config(libyuv.BUILDERS, libyuv.RECIPE_CONFIGS) |
- api.bot_update.ensure_checkout(force=True) |
+ libyuv.checkout() |
api.chromium.ensure_goma() |
api.chromium.runhooks() |
@@ -34,10 +36,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()) |
@@ -49,6 +57,12 @@ 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') |
+ |
+ if bot_type in ('builder', 'builder_tester'): |
+ assert bot_config.get('parent_buildername') is None, ( |
Michael Achenbach
2016/09/06 08:17:49
Very strict. We don't ensure many things that we d
kjellander_chromium
2016/09/06 10:52:34
Let's just remove this check instead (it was copy-
|
+ 'Unexpected parent_buildername for builder %r on master %r.' % |
+ (buildername, mastername)) |
chromium_kwargs = bot_config.get('chromium_config_kwargs', {}) |
test = ( |
@@ -62,11 +76,18 @@ 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(patch_url='try_job_svn_patch') |
+ test += api.properties(buildnumber=1337) |
return test |
for mastername, master_config in builders.iteritems(): |