| 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 slave import recipe_api | 6 from slave 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 | 57 |
| 58 # To more easily diagnose failures from logs, enable logging in | 58 # To more easily diagnose failures from logs, enable logging in |
| 59 # Blink Release builds. | 59 # Blink Release builds. |
| 60 self.m.chromium.apply_config('blink_logging_on') | 60 self.m.chromium.apply_config('blink_logging_on') |
| 61 | 61 |
| 62 # Use the default Ash and Aura settings on all bots (specifically Blink | 62 # Use the default Ash and Aura settings on all bots (specifically Blink |
| 63 # bots). | 63 # bots). |
| 64 self.m.chromium.c.gyp_env.GYP_DEFINES.pop('use_ash', None) | 64 self.m.chromium.c.gyp_env.GYP_DEFINES.pop('use_ash', None) |
| 65 self.m.chromium.c.gyp_env.GYP_DEFINES.pop('use_aura', None) | 65 self.m.chromium.c.gyp_env.GYP_DEFINES.pop('use_aura', None) |
| 66 | 66 |
| 67 # To print out callstacks on linux bots, we must output symbols as well. | |
| 68 if self.m.platform.is_linux: | |
| 69 self.m.chromium.c.gyp_env.GYP_DEFINES['linux_dump_symbols'] = 1 | |
| 70 | |
| 71 # Enable archiving the GPU tests' isolates in chrome_tests.gypi. | 67 # Enable archiving the GPU tests' isolates in chrome_tests.gypi. |
| 72 # The non-GPU trybots build the "all" target, and these tests | 68 # The non-GPU trybots build the "all" target, and these tests |
| 73 # shouldn't be built or run on those bots. | 69 # shouldn't be built or run on those bots. |
| 74 self.m.chromium.c.gyp_env.GYP_DEFINES['archive_gpu_tests'] = 1 | 70 self.m.chromium.c.gyp_env.GYP_DEFINES['archive_gpu_tests'] = 1 |
| 75 | 71 |
| 76 # TODO(kbr): remove the workaround for http://crbug.com/328249 . | 72 # TODO(kbr): remove the workaround for http://crbug.com/328249 . |
| 77 # See crbug.com/335827 for background on the conditional. | 73 # See crbug.com/335827 for background on the conditional. |
| 78 if not self.m.platform.is_win: | 74 if not self.m.platform.is_win: |
| 79 self.m.chromium.c.gyp_env.GYP_DEFINES['disable_glibcxx_debug'] = 1 | 75 self.m.chromium.c.gyp_env.GYP_DEFINES['disable_glibcxx_debug'] = 1 |
| 80 | 76 |
| (...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 524 if extra_browser_args: | 520 if extra_browser_args: |
| 525 extra_browser_args_string += ' ' + ' '.join(extra_browser_args) | 521 extra_browser_args_string += ' ' + ' '.join(extra_browser_args) |
| 526 test_args.append(extra_browser_args_string) | 522 test_args.append(extra_browser_args_string) |
| 527 | 523 |
| 528 return self.m.chromium.steps.TelemetryGPUTest( | 524 return self.m.chromium.steps.TelemetryGPUTest( |
| 529 name, chrome_revision, webkit_revision, args=test_args, | 525 name, chrome_revision, webkit_revision, args=test_args, |
| 530 target_name=target_name, enable_swarming=enable_swarming, | 526 target_name=target_name, enable_swarming=enable_swarming, |
| 531 swarming_dimensions=swarming_dimensions, | 527 swarming_dimensions=swarming_dimensions, |
| 532 master_class_name=self._master_class_name_for_testing, | 528 master_class_name=self._master_class_name_for_testing, |
| 533 swarming_extra_suffix=self._get_gpu_suffix(swarming_dimensions)) | 529 swarming_extra_suffix=self._get_gpu_suffix(swarming_dimensions)) |
| OLD | NEW |