Index: scripts/slave/recipes/chromium_trybot.py |
diff --git a/scripts/slave/recipes/chromium_trybot.py b/scripts/slave/recipes/chromium_trybot.py |
index f0ab75ad3f0c0f6c7b8456fc7406983b5e337ce4..221b3e78c438b82bdb876952b4d4b8b5c90cb845 100644 |
--- a/scripts/slave/recipes/chromium_trybot.py |
+++ b/scripts/slave/recipes/chromium_trybot.py |
@@ -366,6 +366,8 @@ def _GenStepsInternal(api): |
enable_swarming=True, |
swarming_dimension_sets=CHROMIUM_GPU_DIMENSION_SETS[master][builder])) |
+ amp_tests = list(bot_config.get('amp_tests', [])) |
navabi
2015/04/22 16:16:48
This isn't doing what I expected for the 'Android
Paweł Hajdan Jr.
2015/04/22 16:25:10
That's because bot_config here refers to the trybo
|
+ |
# TODO(phajdan.jr): Remove special case for layout tests. |
# This could be done by moving layout tests to main waterfall. |
affected_files = api.tryserver.get_files_affected_by_patch() |
@@ -379,7 +381,7 @@ def _GenStepsInternal(api): |
bot_config['buildername'], |
master_dict, |
override_bot_type='builder_tester', |
- override_tests=tests) |
+ override_tests=(tests + amp_tests)) |
requires_compile, _, compile_targets = \ |
api.chromium_tests.analyze( |
@@ -392,6 +394,7 @@ def _GenStepsInternal(api): |
return |
tests = tests_in_compile_targets(api, compile_targets, tests) |
+ amp_tests = tests_in_compile_targets(api, compile_targets, amp_tests) |
tests_including_triggered = tests_in_compile_targets( |
api, compile_targets, tests_including_triggered) |
@@ -409,7 +412,7 @@ def _GenStepsInternal(api): |
return |
api.chromium_tests.run_tests_and_deapply_as_needed(mastername, api, tests, |
- bot_update_step) |
+ bot_update_step, amp_tests) |
def GenSteps(api): |