| 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 recipe_engine.types import freeze | 5 from recipe_engine.types import freeze |
| 6 from recipe_engine import recipe_api | 6 from recipe_engine import recipe_api |
| 7 | 7 |
| 8 import common | 8 import common |
| 9 | 9 |
| 10 SIMPLE_TESTS_TO_RUN = freeze([ | 10 SIMPLE_TESTS_TO_RUN = freeze([ |
| (...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 607 if not (step_name.endswith('test') or step_name.endswith('tests')): | 607 if not (step_name.endswith('test') or step_name.endswith('tests')): |
| 608 step_name = '%s_tests' % step_name | 608 step_name = '%s_tests' % step_name |
| 609 # Prepend Telemetry GPU-specific flags. | 609 # Prepend Telemetry GPU-specific flags. |
| 610 benchmark_name = target_name or name | 610 benchmark_name = target_name or name |
| 611 prefix_args = [ | 611 prefix_args = [ |
| 612 benchmark_name, '--show-stdout', | 612 benchmark_name, '--show-stdout', |
| 613 '--browser=%s' % self.m.chromium.c.build_config_fs.lower() ] | 613 '--browser=%s' % self.m.chromium.c.build_config_fs.lower() ] |
| 614 if enable_swarming: | 614 if enable_swarming: |
| 615 return self.m.chromium_tests.steps.SwarmingIsolatedScriptTest( | 615 return self.m.chromium_tests.steps.SwarmingIsolatedScriptTest( |
| 616 name, args=prefix_args + test_args, | 616 name, args=prefix_args + test_args, |
| 617 target_name='telemetry_gpu_new_test', | 617 target_name='telemetry_gpu_test', |
| 618 dimensions=swarming_dimensions, | 618 dimensions=swarming_dimensions, |
| 619 tags={'gpu_test:1'}, | 619 tags={'gpu_test:1'}, |
| 620 extra_suffix=self._get_gpu_suffix(swarming_dimensions), | 620 extra_suffix=self._get_gpu_suffix(swarming_dimensions), |
| 621 override_compile_targets=['telemetry_gpu_new_test_run']) | 621 override_compile_targets=['telemetry_gpu_test_run']) |
| 622 else: | 622 else: |
| 623 return self.m.chromium_tests.steps.LocalIsolatedScriptTest( | 623 return self.m.chromium_tests.steps.LocalIsolatedScriptTest( |
| 624 step_name, args=prefix_args + test_args, | 624 step_name, args=prefix_args + test_args, |
| 625 target_name='telemetry_gpu_new_test', | 625 target_name='telemetry_gpu_test', |
| 626 override_compile_targets=['telemetry_gpu_new_test_run']) | 626 override_compile_targets=['telemetry_gpu_test_run']) |
| OLD | NEW |