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

Unified Diff: scripts/slave/annotated_run.py

Issue 15329006: Fix seed_steps for generator annotation recipes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 7 years, 7 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 | « scripts/common/annotator.py ('k') | scripts/slave/recipes_test/run_presubmit.blink.expected » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/annotated_run.py
diff --git a/scripts/slave/annotated_run.py b/scripts/slave/annotated_run.py
index a6aae072b14bf244c60f94720d8b6d51605863f9..c9392c01d11dce026cd4182a5d3ce40bbd6a7f4a 100755
--- a/scripts/slave/annotated_run.py
+++ b/scripts/slave/annotated_run.py
@@ -116,6 +116,8 @@ def fixup_seed_steps(sequence):
if appropriate."""
if sequence and 'seed_steps' not in sequence[0]:
sequence[0]['seed_steps'] = [x['name'] for x in sequence]
+ for other in sequence[1:]:
+ other['seed_steps'] = []
def ensure_sequence_of_steps(step_or_steps):
@@ -290,7 +292,10 @@ def run_steps(stream, build_properties, factory_properties, test_data=None):
assert not(json_data and json_output_name), (
"Cannot have both static_json_data as well as dynamic json_data")
if test_data is None:
- failed, [retcode] = annotator.run_steps([step], failed)
+ # Manually mangae seed_steps because annotator.py doesn't have enough
+ # context
+ seed_steps = step.pop('seed_steps')
+ failed, [retcode] = annotator.run_steps([step], failed, seed_steps)
if json_output_name:
try:
json_data = json.load(os.fdopen(json_output_fd, 'r'))
« no previous file with comments | « scripts/common/annotator.py ('k') | scripts/slave/recipes_test/run_presubmit.blink.expected » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698