OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 | 5 |
6 class Test(object): | 6 class Test(object): |
7 """ | 7 """ |
8 Base class for tests that can be retried after deapplying a previously | 8 Base class for tests that can be retried after deapplying a previously |
9 applied patch. | 9 applied patch. |
10 """ | 10 """ |
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
531 targets.append('crash_service') | 531 targets.append('crash_service') |
532 | 532 |
533 return targets | 533 return targets |
534 | 534 |
535 | 535 |
536 class TelemetryUnitTests(PythonBasedTest): # pylint: disable=W0232 | 536 class TelemetryUnitTests(PythonBasedTest): # pylint: disable=W0232 |
537 name = 'telemetry_unittests' | 537 name = 'telemetry_unittests' |
538 | 538 |
539 @staticmethod | 539 @staticmethod |
540 def compile_targets(_): | 540 def compile_targets(_): |
541 return ['chrome'] | 541 # Include chrome_run as filter picks up chrome and not chrome_run. |
| 542 return ['chrome', 'chrome_run'] |
542 | 543 |
543 def run_step(self, api, suffix, cmd_args, **kwargs): | 544 def run_step(self, api, suffix, cmd_args, **kwargs): |
544 return api.chromium.run_telemetry_unittests(suffix, cmd_args, **kwargs) | 545 return api.chromium.run_telemetry_unittests(suffix, cmd_args, **kwargs) |
545 | 546 |
546 | 547 |
547 class TelemetryPerfUnitTests(PythonBasedTest): | 548 class TelemetryPerfUnitTests(PythonBasedTest): |
548 name = 'telemetry_perf_unittests' | 549 name = 'telemetry_perf_unittests' |
549 | 550 |
550 @staticmethod | 551 @staticmethod |
551 def compile_targets(_): | 552 def compile_targets(_): |
552 return ['chrome'] | 553 # Include chrome_run as filter picks up chrome and not chrome_run. |
| 554 return ['chrome', 'chrome_run'] |
553 | 555 |
554 def run_step(self, api, suffix, cmd_args, **kwargs): | 556 def run_step(self, api, suffix, cmd_args, **kwargs): |
555 return api.chromium.run_telemetry_perf_unittests(suffix, cmd_args, | 557 return api.chromium.run_telemetry_perf_unittests(suffix, cmd_args, |
556 **kwargs) | 558 **kwargs) |
557 | 559 |
558 | 560 |
559 class NaclIntegrationTest(Test): # pylint: disable=W0232 | 561 class NaclIntegrationTest(Test): # pylint: disable=W0232 |
560 name = 'nacl_integration' | 562 name = 'nacl_integration' |
561 | 563 |
562 @staticmethod | 564 @staticmethod |
563 def compile_targets(_): | 565 def compile_targets(_): |
564 return ['chrome'] | 566 # Include chrome_run as filter picks up chrome and not chrome_run. |
| 567 return ['chrome', 'chrome_run'] |
565 | 568 |
566 def run(self, api, suffix): | 569 def run(self, api, suffix): |
567 args = [ | 570 args = [ |
568 '--mode', api.chromium.c.build_config_fs, | 571 '--mode', api.chromium.c.build_config_fs, |
569 '--json_build_results_output_file', api.json.output(), | 572 '--json_build_results_output_file', api.json.output(), |
570 ] | 573 ] |
571 | 574 |
572 self._test_runs[suffix] = api.python( | 575 self._test_runs[suffix] = api.python( |
573 self._step_name(suffix), | 576 self._step_name(suffix), |
574 api.path['checkout'].join('chrome', | 577 api.path['checkout'].join('chrome', |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
736 GTestTest('components_unittests'), | 739 GTestTest('components_unittests'), |
737 GTestTest('crypto_unittests'), | 740 GTestTest('crypto_unittests'), |
738 GTestTest('gfx_unittests'), | 741 GTestTest('gfx_unittests'), |
739 GTestTest('url_unittests'), | 742 GTestTest('url_unittests'), |
740 GTestTest('content_unittests'), | 743 GTestTest('content_unittests'), |
741 GTestTest('net_unittests'), | 744 GTestTest('net_unittests'), |
742 GTestTest('ui_unittests'), | 745 GTestTest('ui_unittests'), |
743 GTestTest('sync_unit_tests'), | 746 GTestTest('sync_unit_tests'), |
744 GTestTest('sql_unittests'), | 747 GTestTest('sql_unittests'), |
745 ] | 748 ] |
OLD | NEW |