| 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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 # Copy the test list to avoid mutating it. | 223 # Copy the test list to avoid mutating it. |
| 224 basic_tests = list(SIMPLE_TESTS_TO_RUN) | 224 basic_tests = list(SIMPLE_TESTS_TO_RUN) |
| 225 # Only run tests on the tree closers and on the CQ which are | 225 # Only run tests on the tree closers and on the CQ which are |
| 226 # available in the open-source repository. | 226 # available in the open-source repository. |
| 227 if self.is_fyi_waterfall: | 227 if self.is_fyi_waterfall: |
| 228 basic_tests += SIMPLE_NON_OPEN_SOURCE_TESTS_TO_RUN | 228 basic_tests += SIMPLE_NON_OPEN_SOURCE_TESTS_TO_RUN |
| 229 for test in basic_tests: | 229 for test in basic_tests: |
| 230 yield self._run_isolate(test, args=['--use-gpu-in-tests']) | 230 yield self._run_isolate(test, args=['--use-gpu-in-tests']) |
| 231 | 231 |
| 232 # Google Maps Pixel tests. | 232 # Google Maps Pixel tests. |
| 233 yield self._run_isolated_telemetry_gpu_test( | 233 # TODO(kbr): re-enable on Win try servers. crbug.com/395914 |
| 234 'maps', name='maps_pixel_test', | 234 if not (self.m.platform.is_win and self.m.tryserver.is_tryserver): |
| 235 args=[ | 235 yield self._run_isolated_telemetry_gpu_test( |
| 236 '--build-revision', | 236 'maps', name='maps_pixel_test', |
| 237 str(self._build_revision), | 237 args=[ |
| 238 '--test-machine-name', | 238 '--build-revision', |
| 239 self.m.properties['buildername'] | 239 str(self._build_revision), |
| 240 ]) | 240 '--test-machine-name', |
| 241 self.m.properties['buildername'] |
| 242 ]) |
| 241 | 243 |
| 242 # Pixel tests. | 244 # Pixel tests. |
| 243 # Try servers pull their results from cloud storage; the other | 245 # Try servers pull their results from cloud storage; the other |
| 244 # tester bots send their results to cloud storage. | 246 # tester bots send their results to cloud storage. |
| 245 # | 247 # |
| 246 # NOTE that ALL of the bots need to share a bucket. They can't be split | 248 # NOTE that ALL of the bots need to share a bucket. They can't be split |
| 247 # by mastername/waterfall, because the try servers are on a different | 249 # by mastername/waterfall, because the try servers are on a different |
| 248 # waterfall (tryserver.chromium) than the other test bots (chromium.gpu | 250 # waterfall (tryserver.chromium) than the other test bots (chromium.gpu |
| 249 # and chromium.webkit, as of this writing). This means there will be | 251 # and chromium.webkit, as of this writing). This means there will be |
| 250 # races between bots with identical OS/GPU combinations, on different | 252 # races between bots with identical OS/GPU combinations, on different |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 yield self.m.isolate.run_telemetry_test( | 348 yield self.m.isolate.run_telemetry_test( |
| 347 'telemetry_gpu_test', | 349 'telemetry_gpu_test', |
| 348 test, | 350 test, |
| 349 self._build_revision, | 351 self._build_revision, |
| 350 self._webkit_revision, | 352 self._webkit_revision, |
| 351 args=test_args, | 353 args=test_args, |
| 352 name=name, | 354 name=name, |
| 353 master_class_name=self._master_class_name_for_testing, | 355 master_class_name=self._master_class_name_for_testing, |
| 354 spawn_dbus=True, | 356 spawn_dbus=True, |
| 355 **kwargs) | 357 **kwargs) |
| OLD | NEW |