Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Side by Side Diff: scripts/slave/recipe_modules/gpu/api.py

Issue 1408863011: infra: Remove all references to the OSX 10.10 SDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Remove another newly added 10_10 sdk reference. Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 recipe_engine.types import freeze 5 from recipe_engine.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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 69
70 # To catch errors earlier on Release bots, in particular the try 70 # To catch errors earlier on Release bots, in particular the try
71 # servers which are Release mode only, force dcheck and blink 71 # servers which are Release mode only, force dcheck and blink
72 # asserts on. 72 # asserts on.
73 self.m.chromium.apply_config('dcheck') 73 self.m.chromium.apply_config('dcheck')
74 74
75 # To more easily diagnose failures from logs, enable logging in 75 # To more easily diagnose failures from logs, enable logging in
76 # Blink Release builds. 76 # Blink Release builds.
77 self.m.chromium.apply_config('blink_logging_on') 77 self.m.chromium.apply_config('blink_logging_on')
78 78
79 # The FYI waterfall is being used to test linking Chrome Mac against the
80 # OSX 10.10 SDK.
81 if self.is_fyi_waterfall and self.m.platform.is_mac:
82 self.m.chromium.apply_config('chromium_mac_sdk_10_10')
83
84 # Use the default Ash and Aura settings on all bots (specifically Blink 79 # Use the default Ash and Aura settings on all bots (specifically Blink
85 # bots). 80 # bots).
86 self.m.chromium.c.gyp_env.GYP_DEFINES.pop('use_ash', None) 81 self.m.chromium.c.gyp_env.GYP_DEFINES.pop('use_ash', None)
87 self.m.chromium.c.gyp_env.GYP_DEFINES.pop('use_aura', None) 82 self.m.chromium.c.gyp_env.GYP_DEFINES.pop('use_aura', None)
88 83
89 # Enable archiving the GPU tests' isolates in chrome_tests.gypi. 84 # Enable archiving the GPU tests' isolates in chrome_tests.gypi.
90 # The non-GPU trybots build the "all" target, and these tests 85 # The non-GPU trybots build the "all" target, and these tests
91 # shouldn't be built or run on those bots. 86 # shouldn't be built or run on those bots.
92 self.m.chromium.c.gyp_env.GYP_DEFINES['archive_gpu_tests'] = 1 87 self.m.chromium.c.gyp_env.GYP_DEFINES['archive_gpu_tests'] = 1
93 88
(...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 if extra_browser_args: 564 if extra_browser_args:
570 extra_browser_args_string += ' ' + ' '.join(extra_browser_args) 565 extra_browser_args_string += ' ' + ' '.join(extra_browser_args)
571 test_args.append(extra_browser_args_string) 566 test_args.append(extra_browser_args_string)
572 567
573 return self.m.chromium_tests.steps.TelemetryGPUTest( 568 return self.m.chromium_tests.steps.TelemetryGPUTest(
574 name, chrome_revision, webkit_revision, args=test_args, 569 name, chrome_revision, webkit_revision, args=test_args,
575 target_name=target_name, enable_swarming=enable_swarming, 570 target_name=target_name, enable_swarming=enable_swarming,
576 swarming_dimensions=swarming_dimensions, 571 swarming_dimensions=swarming_dimensions,
577 master_class_name=self._master_class_name_for_testing, 572 master_class_name=self._master_class_name_for_testing,
578 swarming_extra_suffix=self._get_gpu_suffix(swarming_dimensions)) 573 swarming_extra_suffix=self._get_gpu_suffix(swarming_dimensions))
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698