| 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 infra.libs.infra_types import freeze | 5 from infra.libs.infra_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 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 494 # The step test must end in 'test' or 'tests' in order for the results to | 494 # The step test must end in 'test' or 'tests' in order for the results to |
| 495 # automatically show up on the flakiness dashboard. | 495 # automatically show up on the flakiness dashboard. |
| 496 # | 496 # |
| 497 # Currently all tests on the GPU bots follow this rule, so we can't add | 497 # Currently all tests on the GPU bots follow this rule, so we can't add |
| 498 # code like in chromium/api.py, run_telemetry_test. | 498 # code like in chromium/api.py, run_telemetry_test. |
| 499 | 499 |
| 500 target_name = target_name or name | 500 target_name = target_name or name |
| 501 assert target_name.endswith('test') or target_name.endswith('tests') | 501 assert target_name.endswith('test') or target_name.endswith('tests') |
| 502 | 502 |
| 503 results_directory = self.m.path['slave_build'].join('gtest-results', name) | 503 results_directory = self.m.path['slave_build'].join('gtest-results', name) |
| 504 return self.m.chromium.steps.GPUGTestTest( | 504 return self.m.chromium_tests.steps.GPUGTestTest( |
| 505 name, | 505 name, |
| 506 xvfb=False, | 506 xvfb=False, |
| 507 args=args, | 507 args=args, |
| 508 target_name=target_name, | 508 target_name=target_name, |
| 509 use_isolate=True, | 509 use_isolate=True, |
| 510 generate_json_file=True, | 510 generate_json_file=True, |
| 511 results_directory=results_directory, | 511 results_directory=results_directory, |
| 512 revision=chrome_revision, | 512 revision=chrome_revision, |
| 513 webkit_revision=webkit_revision, | 513 webkit_revision=webkit_revision, |
| 514 master_class_name=self._master_class_name_for_testing, | 514 master_class_name=self._master_class_name_for_testing, |
| (...skipping 15 matching lines...) Expand all Loading... |
| 530 if self.m.platform.is_mac and not self.m.tryserver.is_tryserver: | 530 if self.m.platform.is_mac and not self.m.tryserver.is_tryserver: |
| 531 #TODO(zmo): remove the vmodule flag after crbug.com/424024 is fixed. | 531 #TODO(zmo): remove the vmodule flag after crbug.com/424024 is fixed. |
| 532 vmodules = [ | 532 vmodules = [ |
| 533 'startup_browser_creator=2' | 533 'startup_browser_creator=2' |
| 534 ] | 534 ] |
| 535 extra_browser_args_string += ' --vmodule=' + ','.join(vmodules) | 535 extra_browser_args_string += ' --vmodule=' + ','.join(vmodules) |
| 536 if extra_browser_args: | 536 if extra_browser_args: |
| 537 extra_browser_args_string += ' ' + ' '.join(extra_browser_args) | 537 extra_browser_args_string += ' ' + ' '.join(extra_browser_args) |
| 538 test_args.append(extra_browser_args_string) | 538 test_args.append(extra_browser_args_string) |
| 539 | 539 |
| 540 return self.m.chromium.steps.TelemetryGPUTest( | 540 return self.m.chromium_tests.steps.TelemetryGPUTest( |
| 541 name, chrome_revision, webkit_revision, args=test_args, | 541 name, chrome_revision, webkit_revision, args=test_args, |
| 542 target_name=target_name, enable_swarming=enable_swarming, | 542 target_name=target_name, enable_swarming=enable_swarming, |
| 543 swarming_dimensions=swarming_dimensions, | 543 swarming_dimensions=swarming_dimensions, |
| 544 master_class_name=self._master_class_name_for_testing, | 544 master_class_name=self._master_class_name_for_testing, |
| 545 swarming_extra_suffix=self._get_gpu_suffix(swarming_dimensions)) | 545 swarming_extra_suffix=self._get_gpu_suffix(swarming_dimensions)) |
| OLD | NEW |