| 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 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 result = self.m.step('killall gnome-keyring-daemon', | 306 result = self.m.step('killall gnome-keyring-daemon', |
| 307 ['killall', '-9', 'gnome-keyring-daemon']) | 307 ['killall', '-9', 'gnome-keyring-daemon']) |
| 308 except self.m.step.StepFailure as f: | 308 except self.m.step.StepFailure as f: |
| 309 result = f.result | 309 result = f.result |
| 310 result.presentation.status = self.m.step.SUCCESS | 310 result.presentation.status = self.m.step.SUCCESS |
| 311 | 311 |
| 312 tests = [] | 312 tests = [] |
| 313 | 313 |
| 314 # Run only the dEQP tests on the dEQP GPU bots. | 314 # Run only the dEQP tests on the dEQP GPU bots. |
| 315 if self.is_deqp_tester: | 315 if self.is_deqp_tester: |
| 316 tests.append(self._create_gtest( | 316 # TODO(jmadill): re-enable this once the GLES3 tests are ready |
| 317 'angle_deqp_tests', chrome_revision, webkit_revision, | 317 #tests.append(self._create_gtest( |
| 318 enable_swarming, swarming_dimensions)) | 318 # 'angle_deqp_tests', chrome_revision, webkit_revision, |
| 319 # enable_swarming, swarming_dimensions)) |
| 319 return tests | 320 return tests |
| 320 | 321 |
| 321 # Copy the test list to avoid mutating it. | 322 # Copy the test list to avoid mutating it. |
| 322 basic_tests = list(SIMPLE_TESTS_TO_RUN) | 323 basic_tests = list(SIMPLE_TESTS_TO_RUN) |
| 323 if self.is_fyi_waterfall: | 324 if self.is_fyi_waterfall: |
| 324 # Only run tests on the tree closers and on the CQ which are | 325 # Only run tests on the tree closers and on the CQ which are |
| 325 # available in the open-source repository. | 326 # available in the open-source repository. |
| 326 basic_tests += SIMPLE_NON_OPEN_SOURCE_TESTS_TO_RUN | 327 basic_tests += SIMPLE_NON_OPEN_SOURCE_TESTS_TO_RUN |
| 327 if self.m.platform.is_win or self.m.platform.is_linux: | 328 if self.m.platform.is_win or self.m.platform.is_linux: |
| 328 # TODO(kbr): run these tests on the trybots as soon as there | 329 # TODO(kbr): run these tests on the trybots as soon as there |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 566 if extra_browser_args: | 567 if extra_browser_args: |
| 567 extra_browser_args_string += ' ' + ' '.join(extra_browser_args) | 568 extra_browser_args_string += ' ' + ' '.join(extra_browser_args) |
| 568 test_args.append(extra_browser_args_string) | 569 test_args.append(extra_browser_args_string) |
| 569 | 570 |
| 570 return self.m.chromium_tests.steps.TelemetryGPUTest( | 571 return self.m.chromium_tests.steps.TelemetryGPUTest( |
| 571 name, chrome_revision, webkit_revision, args=test_args, | 572 name, chrome_revision, webkit_revision, args=test_args, |
| 572 target_name=target_name, enable_swarming=enable_swarming, | 573 target_name=target_name, enable_swarming=enable_swarming, |
| 573 swarming_dimensions=swarming_dimensions, | 574 swarming_dimensions=swarming_dimensions, |
| 574 master_class_name=self._master_class_name_for_testing, | 575 master_class_name=self._master_class_name_for_testing, |
| 575 swarming_extra_suffix=self._get_gpu_suffix(swarming_dimensions)) | 576 swarming_extra_suffix=self._get_gpu_suffix(swarming_dimensions)) |
| OLD | NEW |