annotator_commands: allow running different annotated scripts

scripts/master/factory/annotator_factory.py

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Utility class to generate and manage a factory to be passed to a
 builder dictionary as the 'factory' member, for each builder in c['builders'].
 
 Specifically creates a basic factory that will execute an arbirary annotator
 script.
 """
@@ skipping 36 matching lines @@
     forcibly killed.
     """
     factory_properties = factory_properties or {}
     if recipe:
       factory_properties.update({'recipe': recipe})
     self._factory_properties = factory_properties
     factory = BuildFactory(build_inherit_factory_properties=False)
     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(
           t, trigger_copy_properties=['swarm_hashes']))
 
     return factory