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

Side by Side Diff: scripts/slave/recipe_modules/chromium/config.py

Issue 1766073002: Do not use MB for Clang Upload bots. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: don't run mb Created 4 years, 9 months 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 import pipes 5 import pipes
6 6
7 from recipe_engine.config import config_item_context, ConfigGroup 7 from recipe_engine.config import config_item_context, ConfigGroup
8 from recipe_engine.config import Dict, List, Single, Static, Set, BadConf 8 from recipe_engine.config import Dict, List, Single, Static, Set, BadConf
9 from recipe_engine.config_types import Path 9 from recipe_engine.config_types import Path
10 10
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 GYP_INCLUDE_LAST = Single(Path, required=False), 65 GYP_INCLUDE_LAST = Single(Path, required=False),
66 GYP_LINK_CONCURRENCY = Single(int, required=False), 66 GYP_LINK_CONCURRENCY = Single(int, required=False),
67 GYP_MSVS_VERSION = Single(basestring, required=False), 67 GYP_MSVS_VERSION = Single(basestring, required=False),
68 GYP_USE_SEPARATE_MSPDBSRV = Single(int, jsonish_fn=str, required=False), 68 GYP_USE_SEPARATE_MSPDBSRV = Single(int, jsonish_fn=str, required=False),
69 LLVM_DOWNLOAD_GOLD_PLUGIN = Single(int, required=False), 69 LLVM_DOWNLOAD_GOLD_PLUGIN = Single(int, required=False),
70 ), 70 ),
71 env = ConfigGroup( 71 env = ConfigGroup(
72 PATH = List(Path), 72 PATH = List(Path),
73 ADB_VENDOR_KEYS = Single(Path, required=False), 73 ADB_VENDOR_KEYS = Single(Path, required=False),
74 LLVM_FORCE_HEAD_REVISION = Single(basestring, required=False), 74 LLVM_FORCE_HEAD_REVISION = Single(basestring, required=False),
75 LLVM_FORCE_LOCAL_BUILD = Single(basestring, required=False),
75 GOMA_STUBBY_PROXY_IP_ADDRESS = Single(basestring, required=False), 76 GOMA_STUBBY_PROXY_IP_ADDRESS = Single(basestring, required=False),
76 ), 77 ),
77 project_generator = ConfigGroup( 78 project_generator = ConfigGroup(
78 tool = Single(basestring, empty_val='gyp'), 79 tool = Single(basestring, empty_val='gyp'),
79 args = Set(basestring), 80 args = Set(basestring),
80 ), 81 ),
81 build_dir = Single(Path), 82 build_dir = Single(Path),
82 cros_sdk = ConfigGroup( 83 cros_sdk = ConfigGroup(
83 external = Single(bool, empty_val=True, required=False), 84 external = Single(bool, empty_val=True, required=False),
84 args = List(basestring), 85 args = List(basestring),
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 @config_ctx() 539 @config_ctx()
539 def clang_tot(c): 540 def clang_tot(c):
540 c.env.LLVM_FORCE_HEAD_REVISION = 'YES' 541 c.env.LLVM_FORCE_HEAD_REVISION = 'YES'
541 # Plugin flags often need to be changed when using a plugin newer than 542 # Plugin flags often need to be changed when using a plugin newer than
542 # the latest Clang package, so disable plugins. 543 # the latest Clang package, so disable plugins.
543 # TODO(pcc): Investigate whether this should be consistent between Windows and 544 # TODO(pcc): Investigate whether this should be consistent between Windows and
544 # non-Windows. 545 # non-Windows.
545 if c.TARGET_PLATFORM != 'win': 546 if c.TARGET_PLATFORM != 'win':
546 c.gyp_env.GYP_DEFINES['clang_use_chrome_plugins'] = 0 547 c.gyp_env.GYP_DEFINES['clang_use_chrome_plugins'] = 0
547 548
549 @config_ctx()
550 def clang_upload(c):
551 c.env.LLVM_FORCE_LOCAL_BUILD = 'YES'
552
548 @config_ctx(includes=['ninja', 'clang', 'asan', 'static_library']) 553 @config_ctx(includes=['ninja', 'clang', 'asan', 'static_library'])
549 def win_asan(c): 554 def win_asan(c):
550 # These are set on the lkgr bot, and the fyi bots should match the lkgr bot. 555 # These are set on the lkgr bot, and the fyi bots should match the lkgr bot.
551 # TODO(thakis): Once the lkgr bot uses recipes, the lkgr and the fyi bots 556 # TODO(thakis): Once the lkgr bot uses recipes, the lkgr and the fyi bots
552 # should use the same context to ensure they use the same gyp defines. 557 # should use the same context to ensure they use the same gyp defines.
553 c.gyp_env.GYP_DEFINES['enable_ipc_fuzzer'] = 1 558 c.gyp_env.GYP_DEFINES['enable_ipc_fuzzer'] = 1
554 c.gyp_env.GYP_DEFINES['v8_enable_verify_heap'] = 1 559 c.gyp_env.GYP_DEFINES['v8_enable_verify_heap'] = 1
555 560
556 #### 'Full' configurations 561 #### 'Full' configurations
557 @config_ctx(includes=['ninja', 'default_compiler']) 562 @config_ctx(includes=['ninja', 'default_compiler'])
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
811 def cast_linux(c): 816 def cast_linux(c):
812 c.gyp_env.GYP_DEFINES['chromecast'] = 1 817 c.gyp_env.GYP_DEFINES['chromecast'] = 1
813 818
814 @config_ctx() 819 @config_ctx()
815 def internal_gles2_conform_tests(c): 820 def internal_gles2_conform_tests(c):
816 c.gyp_env.GYP_DEFINES['internal_gles2_conform_tests'] = 1 821 c.gyp_env.GYP_DEFINES['internal_gles2_conform_tests'] = 1
817 822
818 @config_ctx() 823 @config_ctx()
819 def build_angle_deqp_tests(c): 824 def build_angle_deqp_tests(c):
820 c.gyp_env.GYP_DEFINES['build_angle_deqp_tests'] = 1 825 c.gyp_env.GYP_DEFINES['build_angle_deqp_tests'] = 1
OLDNEW
« no previous file with comments | « scripts/slave/recipe_modules/chromium/api.py ('k') | scripts/slave/recipes/chromium_clang_upload.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698