Add support for cc_perftests and other non-telemetry gtest based tests.

scripts/slave/recipe_modules/chromium/steps.py

 # Copyright 2014 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.
 
 import re
 
 
 class Test(object):
   """
   Base class for tests that can be retried after deapplying a previously
@@ skipping 85 matching lines @@
 
   This makes it possible to keep the logic src-side as opposed
   to the build repo most Chromium developers are unfamiliar with.
 
   Another advantage is being to test changes to these scripts
   on trybots.
 
   All new tests are strongly encouraged to use this infrastructure.
   """
 
-  def __init__(self, name, script, all_compile_targets):
+  def __init__(self, name, script, all_compile_targets, script_args=None):
     super(ScriptTest, self).__init__()
     self._name = name
     self._script = script
     self._all_compile_targets = all_compile_targets
+    self._script_args = script_args
 
   @property
   def name(self):
     return self._name
 
   def compile_targets(self, api):
     try:
-      return self._all_compile_targets[self._script]
+      target_name = self._name

[Paweł Hajdan Jr., 2015/02/11 08:24:03]

This is not target name, but test/step name. Real target names come from the
script.

[shatch, 2015/02/12 20:46:32]

Ok, checked for script args and take the target name from the script instead.

+      if api.chromium.c.TARGET_PLATFORM == 'android':
+        target_name += '_apk'

[Paweł Hajdan Jr., 2015/02/11 08:24:03]

Similarly, this logic does not belong here. Just remove it.

[shatch, 2015/02/12 20:46:32]

Made a change in the other CL to add the _apk.

+
+      return [string.Template(s).safe_substitute({'name': target_name})

[Paweł Hajdan Jr., 2015/02/11 08:24:03]

Did you run this locally? I'd expect a NameError for string since it doesn't
seem to be imported.

[shatch, 2015/02/12 20:46:32]

Oops, not sure how I lost that.

+              for s in self._all_compile_targets[self._script]]
     except KeyError:
       # Not all scripts will have test data inside recipes,
       # so return a default value.
       # TODO(phajdan.jr): Revisit this when all script tests
       # lists move src-side. We should be able to provide
       # test data then.
       if api.chromium._test_data.enabled:
         return []
 
       raise
 
   def run(self, api, suffix):
     name = self.name
     if suffix:
       name += ' (%s)' % suffix
 
     run_args = []
     if suffix == 'without patch':
       run_args.extend([
           '--filter-file', api.json.input(self.failures(api, 'with patch'))
       ])
 
     try:
+      script_args = []
+      if self._script_args:
+        script_args = ['--args', api.json.input(self._script_args)]
       api.python(
           name,
           # Enforce that all scripts are in the specified directory
           # for consistency.
           api.path['checkout'].join(
               'testing', 'scripts', api.path.basename(self._script)),
           args=(api.chromium.get_common_args_for_scripts() +
+                script_args +
                 ['run', '--output', api.json.output()] +
                 run_args),
           step_test_data=lambda: api.json.test_api.output(
               {'valid': True, 'failures': []}))
     finally:
       self._test_runs[suffix] = api.step.active_result
 
     return self._test_runs[suffix]
 
   def has_valid_results(self, api, suffix):
@@ skipping 158 matching lines @@
                     enable_swarming=use_swarming,
                     swarming_shards=swarming_shards)
 
 
 def generate_script(api, mastername, buildername, test_spec,
                     enable_swarming=False, scripts_compile_targets=None):
   for script_spec in test_spec.get(buildername, {}).get('scripts', []):
     yield ScriptTest(
         str(script_spec['name']),
         script_spec['script'],
-        scripts_compile_targets)
+        scripts_compile_targets,
+        script_spec.get('args', []))
 
 
 class DynamicPerfTests(Test):
   def __init__(self, browser, perf_id, shard_index, num_shards):
     self.browser = browser
     self.perf_id = perf_id
     self.shard_index = shard_index
     self.num_shards = num_shards
 
   @property
@@ skipping 701 matching lines @@
   GTestTest('crypto_unittests'),
   GTestTest('gfx_unittests'),
   GTestTest('url_unittests'),
   GTestTest('content_unittests'),
   GTestTest('net_unittests'),
   GTestTest('ui_base_unittests'),
   GTestTest('ui_ios_unittests'),
   GTestTest('sync_unit_tests'),
   GTestTest('sql_unittests'),
 ]