Index: scripts/slave/recipes/chromium_trybot.py |
diff --git a/scripts/slave/recipes/chromium_trybot.py b/scripts/slave/recipes/chromium_trybot.py |
index 1d1c39de3fd54879b3bb4e941a22869d77e47bfd..1ae1a5fea6f74d178fac28ce2ba38701252ab6c2 100644 |
--- a/scripts/slave/recipes/chromium_trybot.py |
+++ b/scripts/slave/recipes/chromium_trybot.py |
@@ -608,9 +608,7 @@ def GenTests(api): |
api.test('no_compile_because_of_analyze') + |
props(buildername='linux_chromium_rel_ng') + |
api.platform.name('linux') + |
- api.override_step_data('read test spec', api.json.output({ |
- }) |
- ) |
+ api.override_step_data('read test spec', api.json.output({})) |
) |
# Verifies analyze skips projects other than src. |
@@ -619,9 +617,7 @@ def GenTests(api): |
props(buildername='linux_chromium_rel_ng') + |
props(patch_project='blink') + |
api.platform.name('linux') + |
- api.override_step_data('read test spec', api.json.output({ |
- }) |
- ) |
+ api.override_step_data('read test spec', api.json.output({})) |
) |
# This should result in a compile. |
@@ -638,9 +634,7 @@ def GenTests(api): |
api.test('compile_because_of_analyze') + |
props(buildername='linux_chromium_rel_ng') + |
api.platform.name('linux') + |
- api.override_step_data('read test spec', api.json.output({ |
- }) |
- ) + |
+ api.override_step_data('read test spec', api.json.output({})) + |
api.override_step_data( |
'analyze', |
api.json.output({'status': 'Found dependency', 'targets': [], |
@@ -812,6 +806,33 @@ def GenTests(api): |
api.platform.name('win') |
) |
+ # Tests that we only run the gpu_unittests isolate if that's all |
+ # that analyze said to rebuild. |
+ all_hashes = api.gpu.dummy_swarm_hashes |
+ angle_unittests_hash = {x: all_hashes[x] for x in ['gpu_unittests']} |
+ yield ( |
+ api.test('analyze_runs_only_gpu_unittests') + |
+ api.properties.tryserver( |
+ mastername='tryserver.chromium.win', |
+ buildername='win_chromium_rel_ng', |
+ swarm_hashes=angle_unittests_hash |
+ ) + |
+ api.platform.name('win') + |
+ api.override_step_data('analyze', api.gpu.analyze_builds_gpu_unittests) |
+ ) |
+ |
+ # Tests that we run nothing if analyze said we didn't have to run anything. |
+ yield ( |
+ api.test('analyze_runs_nothing') + |
+ api.properties.tryserver( |
+ mastername='tryserver.chromium.win', |
+ buildername='win_chromium_rel_ng', |
+ swarm_hashes={} |
+ ) + |
+ api.platform.name('win') + |
+ api.override_step_data('analyze', api.gpu.analyze_builds_nothing) |
+ ) |
+ |
def step_failure(mastername, buildername, steps, tryserver=False): |
props = api.properties.tryserver if tryserver else api.properties.generic |
return ( |