scripts/master/factory/annotator_factory.py - Issue 1883503003: annotator_commands: allow running different annotated scripts

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: scripts/master/factory/annotator_factory.py

Issue 1883503003: annotator_commands: allow running different annotated scripts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build

Patch Set: Created 4 years, 8 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

Index: scripts/master/factory/annotator_factory.py

diff --git a/scripts/master/factory/annotator_factory.py b/scripts/master/factory/annotator_factory.py

index 9ad163236cce8e9ed84e81675efde4e1b50fddcb..c646457cce20e60c45c93bab8e2113d0098ef40c 100644

--- a/scripts/master/factory/annotator_factory.py

+++ b/scripts/master/factory/annotator_factory.py

@@ -54,7 +54,12 @@ class AnnotatorFactory(object):

factory.properties.update(self._factory_properties, 'AnnotatorFactory')

cmd_obj = annotator_commands.AnnotatorCommands(

factory, active_master=self.active_master)

- cmd_obj.AddAnnotatedScript(timeout=timeout, max_time=max_time)

+ runner = cmd_obj.PathJoin(cmd_obj.script_dir, 'annotated_run.py')

+ cmd = [cmd_obj.python, '-u', runner, '--use-factory-properties-from-disk']

+ cmd = cmd_obj.AddB64GzBuildProperties(cmd)

+ cmd_obj.AddAnnotatedScript(cmd, timeout=timeout, max_time=max_time)

for t in triggers or []:

factory.addStep(commands.CreateTriggerStep(

« no previous file with comments | « scripts/master/factory/annotator_commands.py ('k') | scripts/master/factory/commands.py » ('j') | no next file with comments »