| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 from slave import recipe_api | 5 from slave import recipe_api |
| 6 from slave import recipe_util | 6 from slave import recipe_util |
| 7 | 7 |
| 8 from . import builders | 8 from . import builders |
| 9 from . import steps | 9 from . import steps |
| 10 | 10 |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 generate_json_file=True, | 294 generate_json_file=True, |
| 295 results_directory=results_directory, | 295 results_directory=results_directory, |
| 296 python_mode=True, | 296 python_mode=True, |
| 297 spawn_dbus=spawn_dbus, | 297 spawn_dbus=spawn_dbus, |
| 298 revision=revision, | 298 revision=revision, |
| 299 webkit_revision=webkit_revision, | 299 webkit_revision=webkit_revision, |
| 300 master_class_name=master_class_name, | 300 master_class_name=master_class_name, |
| 301 env=env, | 301 env=env, |
| 302 **kwargs) | 302 **kwargs) |
| 303 | 303 |
| 304 def run_telemetry_unittests(self, suffix=None, **kwargs): | 304 def run_telemetry_unittests(self, suffix=None, cmd_args=None, **kwargs): |
| 305 name = 'telemetry_unittests' | 305 name = 'telemetry_unittests' |
| 306 if suffix: | 306 if suffix: |
| 307 name += ' (%s)' % suffix | 307 name += ' (%s)' % suffix |
| 308 cmd_args = cmd_args or [] |
| 308 return self.runtest( | 309 return self.runtest( |
| 309 self.m.path['checkout'].join('tools', 'telemetry', 'run_tests'), | 310 self.m.path['checkout'].join('tools', 'telemetry', 'run_tests'), |
| 310 args=['--browser=%s' % self.c.build_config_fs.lower()], | 311 args=['--browser=%s' % self.c.build_config_fs.lower()] + cmd_args, |
| 311 annotate='gtest', | 312 annotate='gtest', |
| 312 name=name, | 313 name=name, |
| 313 test_type='telemetry_unittests', | 314 test_type='telemetry_unittests', |
| 314 python_mode=True, | 315 python_mode=True, |
| 315 xvfb=True, | 316 xvfb=True, |
| 316 **kwargs) | 317 **kwargs) |
| 317 | 318 |
| 318 def run_telemetry_perf_unittests(self, suffix=None, **kwargs): | 319 def run_telemetry_perf_unittests(self, suffix=None, cmd_args=None, **kwargs): |
| 319 name = 'telemetry_perf_unittests' | 320 name = 'telemetry_perf_unittests' |
| 320 if suffix: | 321 if suffix: |
| 321 name += ' (%s)' % suffix | 322 name += ' (%s)' % suffix |
| 323 cmd_args = cmd_args or [] |
| 322 return self.runtest( | 324 return self.runtest( |
| 323 self.m.path['checkout'].join('tools', 'perf', 'run_tests'), | 325 self.m.path['checkout'].join('tools', 'perf', 'run_tests'), |
| 324 args=['--browser=%s' % self.c.build_config_fs.lower()], | 326 args=['--browser=%s' % self.c.build_config_fs.lower()] + cmd_args, |
| 325 annotate='gtest', | 327 annotate='gtest', |
| 326 name=name, | 328 name=name, |
| 327 test_type='telemetry_perf_unittests', | 329 test_type='telemetry_perf_unittests', |
| 328 python_mode=True, | 330 python_mode=True, |
| 329 xvfb=True, | 331 xvfb=True, |
| 330 **kwargs) | 332 **kwargs) |
| 331 | 333 |
| 332 def runhooks(self, **kwargs): | 334 def runhooks(self, **kwargs): |
| 333 """Run the build-configuration hooks for chromium.""" | 335 """Run the build-configuration hooks for chromium.""" |
| 334 env = kwargs.get('env', {}) | 336 env = kwargs.get('env', {}) |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 493 steps = [] | 495 steps = [] |
| 494 if bot_type in ['tester', 'builder_tester'] and test_steps: | 496 if bot_type in ['tester', 'builder_tester'] and test_steps: |
| 495 if self.m.platform.is_win: | 497 if self.m.platform.is_win: |
| 496 steps.append(self.crash_handler()) | 498 steps.append(self.crash_handler()) |
| 497 | 499 |
| 498 steps.extend(test_steps) | 500 steps.extend(test_steps) |
| 499 | 501 |
| 500 if self.m.platform.is_win: | 502 if self.m.platform.is_win: |
| 501 steps.append(self.process_dumps()) | 503 steps.append(self.process_dumps()) |
| 502 return steps | 504 return steps |
| OLD | NEW |