Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Unified Diff: scripts/slave/recipes/chromium_trybot.py

Issue 907393002: Don't always run the script tests if there are no compile targets. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_practice_rel_ng_analyze.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium_trybot.py
diff --git a/scripts/slave/recipes/chromium_trybot.py b/scripts/slave/recipes/chromium_trybot.py
index 438e373fb0daa8348f3372d8f9823ab91ab93748..5ae1dcf0c0c69cd7064ff908c8279e0d102c7c45 100644
--- a/scripts/slave/recipes/chromium_trybot.py
+++ b/scripts/slave/recipes/chromium_trybot.py
@@ -544,26 +544,23 @@ def _GenStepsInternal(api):
compile_targets,
'trybot_analyze_config.json')
- if requires_compile:
- tests = tests_in_compile_targets(api, compile_targets, tests)
- tests_including_triggered = tests_in_compile_targets(
- api, compile_targets, tests_including_triggered)
+ if not requires_compile:
+ return
- api.chromium_tests.compile_specific_targets(
- main_waterfall_config['mastername'],
- main_waterfall_config['buildername'],
- bot_update_step,
- master_dict,
- test_spec,
- compile_targets,
- tests_including_triggered,
- override_bot_type='builder_tester',
- disable_isolate=bot_config.get('disable_isolate', False))
- else:
- # Even though the patch doesn't require compile, we'd still like to
- # run tests not depending on compiled targets (that's obviously not
- # covered by the "analyze" step).
- tests = [t for t in tests if not t.compile_targets(api)]
+ tests = tests_in_compile_targets(api, compile_targets, tests)
+ tests_including_triggered = tests_in_compile_targets(
+ api, compile_targets, tests_including_triggered)
+
+ api.chromium_tests.compile_specific_targets(
+ main_waterfall_config['mastername'],
+ main_waterfall_config['buildername'],
+ bot_update_step,
+ master_dict,
+ test_spec,
+ compile_targets,
+ tests_including_triggered,
+ override_bot_type='builder_tester',
+ disable_isolate=bot_config.get('disable_isolate', False))
def deapply_patch_fn(failing_tests):
api.chromium_tests.deapply_patch(bot_update_step)
« no previous file with comments | « no previous file | scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_linux_chromium_practice_rel_ng_analyze.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698