| Index: scripts/slave/recipes/chromium_trybot.py
|
| diff --git a/scripts/slave/recipes/chromium_trybot.py b/scripts/slave/recipes/chromium_trybot.py
|
| index 74d3b3fa28c9e6eb9c9de4756360f9f5860397ce..7a881bba2e1670794cbc23bfb50fbd804e60766b 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.py
|
| +++ b/scripts/slave/recipes/chromium_trybot.py
|
| @@ -833,9 +833,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.
|
| @@ -844,9 +842,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.
|
| @@ -863,9 +859,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': [],
|
| @@ -1037,6 +1031,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 (
|
|
|