Make try job test filter instance specific....

buildbot/scripts/master/factory/commands.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 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.
 
 """Set of utilities to add commands to a buildbot factory (BuildFactory).
 
 All the utility functions to add steps to a build factory here are not
 project-specific. See the other *_commands.py for project-specific commands.
 """
@@ skipping 133 matching lines @@
   def GetTestCommand(self, executable, arg_list=None):
     cmd = [self._python, self._test_tool,
            '--target', self._target,
            '--build-dir', self._build_dir,
            self.GetExecutableName(executable)]
 
     if arg_list is not None:
       cmd.extend(arg_list)
     return cmd
 
-  @staticmethod
-  def DoStepFilterTest(bStep):
-    """Examines the 'testfilters' property of the build and determines if
-    the step should run; True for yes."""
-    try:
-      filters = bStep.getProperty('testfilters')
-    except:
-      return True
-
-    for filter in filters:
-      if filter == bStep.name:
-        return True
-      if filter.startswith(("%s:" % bStep.name)):
-        # TODO(vandebo): We cannot modiby bStep after is it generated from the
-        # factory unless a copy is made.
-        #bStep.command.append("--gtest_filter=%s" % filter.split(':',1)[1])
-        return True
-    return False
-
   def AddTestStep(self, command_class, test_name, test_command,
                   test_description='', timeout=600, workdir=None, env=None,
-                  locks=None, halt_on_failure=False):
+                  locks=None, halt_on_failure=False, do_step_if=True):
     """Adds a step to the factory to run a test.
 
     Args:
       command_class: the command type to run, such as shell.ShellCommand or
           gtest_command.GTestCommand
       test_name: a string describing the test, used to build its logfile name
           and its descriptions in the waterfall display
       timeout: the buildbot timeout for the test, in seconds.  If it doesn't
           produce any output to stdout or stderr for this many seconds,
           buildbot will cancel it and call it a failure.
       test_command: the command list to run
       test_description: an auxiliary description to be appended to the
         test_name in the buildbot display; for example, ' (single process)'
       workdir: directory where the test executable will be launched. If None,
         step will use default directory.
       env: dictionary with environmental variable key value pairs that will be
         set or overridden before launching the test executable. Does not do
         anything if 'env' is None.
       locks: any locks to acquire for this test
       halt_on_failure: whether the current build should halt if this step fails
     """
-    doStepCondition = True
-    if command_class == gtest_command.GTestCommand:
-      doStepCondition = self.DoStepFilterTest
-
     self._factory.addStep(
         command_class,
         name=test_name,
         timeout=timeout,
-        doStepIf=doStepCondition,
+        doStepIf=do_step_if,
         workdir=workdir,
         env=env,
         # TODO(bradnelson): FIXME
         #locks=locks,
         description='running %s%s' % (test_name, test_description),
         descriptionDone='%s%s' % (test_name, test_description),
         haltOnFailure=halt_on_failure,
         command=test_command)
 
+  @staticmethod
+  def GTestStepFilter(bStep):
+    """Examines the 'testfilters' property of the build and determines if
+    the step should run; True for yes."""
+    bStep.setProperty('gtest_filter', None, "Factory")
+    filters = bStep.build.getProperties().getProperty('testfilters')
+    if not filters:
+      return True
+
+    for filter in filters:
+      if filter == bStep.name:
+        return True
+      if filter.startswith("%s:" % bStep.name):
+        bStep.setProperty('gtest_filter', "--gtest_filter=%s" %
+                          filter.split(':',1)[1], "Scheduler")
+        return True
+    return False
+
   def AddBasicGTestTestStep(self, test_name, factory_properties=None,
                             description='', arg_list=None, total_shards=None,
                             shard_index=None):
     """Adds a step to the factory to run the gtest tests.
 
     Args:
       total_shards: Number of shards to split this test into.
       shard_index: Shard to run.  Must be between 1 and ui_total_shards.
       generate_gtest_json: generate JSON results file after running the tests.
     """
@@ skipping 18 matching lines @@
                   '--build-number', WithProperties("%(buildnumber)s"),
                   '--builder-name', WithProperties("%(buildername)s"),])
 
     if total_shards and shard_index:
       cmd.extend(['--total-shards', str(total_shards),
                   '--shard-index', str(shard_index)])
 
     cmd.append(self.GetExecutableName(test_name))
 
     arg_list.append('--gtest_print_time')
+    arg_list.append(WithProperties("%(gtest_filter)s"))
     cmd.extend(arg_list)
 
-    self.AddTestStep(gtest_command.GTestCommand, test_name, cmd, description)
+    self.AddTestStep(gtest_command.GTestCommand, test_name, ListProperties(cmd),
+                     description, do_step_if=self.GTestStepFilter)
 
   def AddBasicShellStep(self, test_name, timeout=600, arg_list=None):
     """Adds a step to the factory to run a simple shell test with standard
     defaults.
     """
     self.AddTestStep(shell.ShellCommand, test_name, timeout=timeout,
                      test_command=self.GetTestCommand(test_name,
                                                       arg_list=arg_list))
 
 
@@ skipping 219 matching lines @@
         raise Exception, ('There is no mapping for identifier %s in %s' %
                             (perf_id, self._target))
       report_link = '%s/%s/%s/%s' % (self.PERF_BASE_URL, perf_name, test_name,
                                      self.PERF_REPORT_URL_SUFFIX)
       output_dir = '%s/%s/%s' % (self.PERF_OUTPUT_DIR, perf_name, test_name)
 
     return self._CreatePerformanceStepClass(log_processor_class,
                report_link=report_link, output_dir=output_dir,
                factory_properties=factory_properties, perf_name=perf_name,
                test_name=test_name)