| Index: scripts/slave/recipe_modules/chromium_tests/api.py
|
| diff --git a/scripts/slave/recipe_modules/chromium_tests/api.py b/scripts/slave/recipe_modules/chromium_tests/api.py
|
| index 25c29b51bd345aff9a20e1c83fc2a6ba1fb75942..af774b7a9a09ef059f896b73936b1536f7c729e3 100644
|
| --- a/scripts/slave/recipe_modules/chromium_tests/api.py
|
| +++ b/scripts/slave/recipe_modules/chromium_tests/api.py
|
| @@ -127,9 +127,6 @@ class ChromiumTestsApi(recipe_api.RecipeApi):
|
| test_spec_file = bot_config.get('testing', {}).get('test_spec_file',
|
| '%s.json' % mastername)
|
|
|
| - if self.m.chromium.c.project_generator.tool == 'mb':
|
| - self.m.chromium.run_mb(mastername, buildername)
|
| -
|
| # TODO(phajdan.jr): Bots should have no generators instead.
|
| if bot_config.get('disable_tests'):
|
| test_spec = {}
|
| @@ -315,6 +312,10 @@ class ChromiumTestsApi(recipe_api.RecipeApi):
|
| self.m.chromium_android.clean_local_files()
|
| self.m.chromium_android.run_tree_truth()
|
|
|
| + if self.m.chromium.c.project_generator.tool == 'mb':
|
| + self.m.chromium.run_mb(mastername, buildername, swarming_targets=[
|
| + t.name for t in tests_including_triggered if t.uses_swarming])
|
| +
|
| if bot_type in ['builder', 'builder_tester']:
|
| isolated_targets = [
|
| t.isolate_target for t in tests_including_triggered if t.uses_swarming
|
|
|