Chromium Code Reviews| 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 import re | 5 import re |
| 6 | 6 |
| 7 from recipe_engine import recipe_api | 7 from recipe_engine import recipe_api |
| 8 from recipe_engine import util as recipe_util | 8 from recipe_engine import util as recipe_util |
| 9 | 9 |
| 10 class TestLauncherFilterFileInputPlaceholder(recipe_util.InputPlaceholder): | 10 class TestLauncherFilterFileInputPlaceholder(recipe_util.InputPlaceholder): |
| (...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 348 raise self.m.step.InfraFailure('Infra compile failure: %s' % e) | 348 raise self.m.step.InfraFailure('Infra compile failure: %s' % e) |
| 349 | 349 |
| 350 raise e | 350 raise e |
| 351 | 351 |
| 352 @recipe_util.returns_placeholder | 352 @recipe_util.returns_placeholder |
| 353 def test_launcher_filter(self, tests): | 353 def test_launcher_filter(self, tests): |
| 354 return TestLauncherFilterFileInputPlaceholder(self, tests) | 354 return TestLauncherFilterFileInputPlaceholder(self, tests) |
| 355 | 355 |
| 356 def runtest(self, test, args=None, xvfb=False, name=None, annotate=None, | 356 def runtest(self, test, args=None, xvfb=False, name=None, annotate=None, |
| 357 results_url=None, perf_dashboard_id=None, test_type=None, | 357 results_url=None, perf_dashboard_id=None, test_type=None, |
| 358 python_mode=False, spawn_dbus=True, parallel=False, | 358 python_mode=False, parallel=False, |
| 359 point_id=None, revision=None, webkit_revision=None, | 359 point_id=None, revision=None, webkit_revision=None, |
| 360 test_launcher_summary_output=None, flakiness_dash=None, | 360 test_launcher_summary_output=None, flakiness_dash=None, |
| 361 perf_id=None, perf_config=None, chartjson_file=False, | 361 perf_id=None, perf_config=None, chartjson_file=False, |
| 362 disable_src_side_runtest_py=False, **kwargs): | 362 disable_src_side_runtest_py=False, **kwargs): |
| 363 """Return a runtest.py invocation.""" | 363 """Return a runtest.py invocation.""" |
| 364 args = args or [] | 364 args = args or [] |
| 365 assert isinstance(args, list) | 365 assert isinstance(args, list) |
| 366 | 366 |
| 367 t_name, ext = self.m.path.splitext(self.m.path.basename(test)) | 367 t_name, ext = self.m.path.splitext(self.m.path.basename(test)) |
| 368 if not python_mode and self.m.platform.is_win and ext == '': | 368 if not python_mode and self.m.platform.is_win and ext == '': |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 418 # These properties are specified on every bot, so pass them down | 418 # These properties are specified on every bot, so pass them down |
| 419 # unconditionally. | 419 # unconditionally. |
| 420 full_args.append('--builder-name=%s' % self.m.properties['buildername']) | 420 full_args.append('--builder-name=%s' % self.m.properties['buildername']) |
| 421 full_args.append('--slave-name=%s' % self.m.properties['slavename']) | 421 full_args.append('--slave-name=%s' % self.m.properties['slavename']) |
| 422 # A couple of the recipes contain tests which don't specify a buildnumber, | 422 # A couple of the recipes contain tests which don't specify a buildnumber, |
| 423 # so make this optional. | 423 # so make this optional. |
| 424 if self.m.properties.get('buildnumber') is not None: | 424 if self.m.properties.get('buildnumber') is not None: |
| 425 full_args.append('--build-number=%s' % self.m.properties['buildnumber']) | 425 full_args.append('--build-number=%s' % self.m.properties['buildnumber']) |
| 426 if ext == '.py' or python_mode: | 426 if ext == '.py' or python_mode: |
| 427 full_args.append('--run-python-script') | 427 full_args.append('--run-python-script') |
| 428 if not spawn_dbus: | |
| 429 full_args.append('--no-spawn-dbus') | |
|
Paweł Hajdan Jr.
2016/11/02 10:06:40
Can we also remove this flag from runtest.py?
Con
tikuta
2016/11/04 02:51:00
Done.
I ran `fgrep 'no-spawn-dbus' . -rsnI` in bu
| |
| 430 if point_id: | 428 if point_id: |
| 431 full_args.append('--point-id=%d' % point_id) | 429 full_args.append('--point-id=%d' % point_id) |
| 432 if revision: | 430 if revision: |
| 433 full_args.append('--revision=%s' % revision) | 431 full_args.append('--revision=%s' % revision) |
| 434 if webkit_revision: | 432 if webkit_revision: |
| 435 # TODO(kbr): figure out how to cover this line of code with | 433 # TODO(kbr): figure out how to cover this line of code with |
| 436 # tests after the removal of the GPU recipe. crbug.com/584469 | 434 # tests after the removal of the GPU recipe. crbug.com/584469 |
| 437 full_args.append( | 435 full_args.append( |
| 438 '--webkit-revision=%s' % webkit_revision) # pragma: no cover | 436 '--webkit-revision=%s' % webkit_revision) # pragma: no cover |
| 439 | 437 |
| (...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 904 })) | 902 })) |
| 905 | 903 |
| 906 def get_annotate_by_test_name(self, test_name): | 904 def get_annotate_by_test_name(self, test_name): |
| 907 return 'graphing' | 905 return 'graphing' |
| 908 | 906 |
| 909 def download_lto_plugin(self): | 907 def download_lto_plugin(self): |
| 910 return self.m.python( | 908 return self.m.python( |
| 911 name='download LTO plugin', | 909 name='download LTO plugin', |
| 912 script=self.m.path['checkout'].join( | 910 script=self.m.path['checkout'].join( |
| 913 'build', 'download_gold_plugin.py')) | 911 'build', 'download_gold_plugin.py')) |
| OLD | NEW |