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 slave import recipe_api | 5 from slave import recipe_api |
6 | 6 |
7 import common | 7 import common |
8 | 8 |
9 SIMPLE_TESTS_TO_RUN = [ | 9 SIMPLE_TESTS_TO_RUN = [ |
10 'content_gl_tests', | 10 'content_gl_tests', |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 # servers which are Release mode only, force dcheck and blink | 44 # servers which are Release mode only, force dcheck and blink |
45 # asserts on. | 45 # asserts on. |
46 self.m.chromium.apply_config('dcheck') | 46 self.m.chromium.apply_config('dcheck') |
47 self.m.chromium.apply_config('blink_asserts_on') | 47 self.m.chromium.apply_config('blink_asserts_on') |
48 | 48 |
49 # Use the default Ash and Aura settings on all bots (specifically Blink | 49 # Use the default Ash and Aura settings on all bots (specifically Blink |
50 # bots). | 50 # bots). |
51 self.m.chromium.c.gyp_env.GYP_DEFINES.pop('use_ash', None) | 51 self.m.chromium.c.gyp_env.GYP_DEFINES.pop('use_ash', None) |
52 self.m.chromium.c.gyp_env.GYP_DEFINES.pop('use_aura', None) | 52 self.m.chromium.c.gyp_env.GYP_DEFINES.pop('use_aura', None) |
53 | 53 |
| 54 # Enable archiving the GPU tests' isolates in chrome_tests.gypi. |
| 55 # The non-GPU trybots build the "all" target, and these tests |
| 56 # shouldn't be built or run on those bots. |
| 57 self.m.chromium.c.gyp_env.GYP_DEFINES['archive_gpu_tests'] = 1 |
| 58 |
54 # TODO(kbr): remove the workaround for http://crbug.com/328249 . | 59 # TODO(kbr): remove the workaround for http://crbug.com/328249 . |
55 # See crbug.com/335827 for background on the conditional. | 60 # See crbug.com/335827 for background on the conditional. |
56 if not self.m.platform.is_win: | 61 if not self.m.platform.is_win: |
57 self.m.chromium.c.gyp_env.GYP_DEFINES['disable_glibcxx_debug'] = 1 | 62 self.m.chromium.c.gyp_env.GYP_DEFINES['disable_glibcxx_debug'] = 1 |
58 | 63 |
59 # Don't skip the frame_rate data, as it's needed for the frame rate tests. | 64 # Don't skip the frame_rate data, as it's needed for the frame rate tests. |
60 # Per iannucci@, it can be relied upon that solutions[1] is src-internal. | 65 # Per iannucci@, it can be relied upon that solutions[1] is src-internal. |
61 # Consider managing this in a 'gpu' config. | 66 # Consider managing this in a 'gpu' config. |
62 del self.m.gclient.c.solutions[1].custom_deps[ | 67 del self.m.gclient.c.solutions[1].custom_deps[ |
63 'src/chrome/test/data/perf/frame_rate/private'] | 68 'src/chrome/test/data/perf/frame_rate/private'] |
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
356 self.get_build_revision(), | 361 self.get_build_revision(), |
357 self.get_webkit_revision(), | 362 self.get_webkit_revision(), |
358 args=test_args, | 363 args=test_args, |
359 name=name, | 364 name=name, |
360 master_class_name=self._master_class_name_for_testing, | 365 master_class_name=self._master_class_name_for_testing, |
361 spawn_dbus=True, | 366 spawn_dbus=True, |
362 **kwargs) | 367 **kwargs) |
363 except self.m.step.StepFailure: | 368 except self.m.step.StepFailure: |
364 # Return test name in the event of failure | 369 # Return test name in the event of failure |
365 return test | 370 return test |
OLD | NEW |