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

Unified Diff: tools/mb/mb.py

Issue 1808093002: mb_config.pyl cleanup: remove unused dev configs from MB. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix indent 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/mb/mb_config.pyl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/mb/mb.py
diff --git a/tools/mb/mb.py b/tools/mb/mb.py
index fe46c4639a53b29ccc74337781ed3ddcc3f078f2..1f1a3a31efac6043482f3ac54f1ba1e46a4eeed4 100755
--- a/tools/mb/mb.py
+++ b/tools/mb/mb.py
@@ -46,9 +46,6 @@ class MetaBuildWrapper(object):
self.configs = {}
self.masters = {}
self.mixins = {}
- self.private_configs = []
- self.common_dev_configs = []
- self.unsupported_configs = []
def Main(self, args):
self.ParseArgs(args)
@@ -272,32 +269,11 @@ class MetaBuildWrapper(object):
# Read the file to make sure it parses.
self.ReadConfigFile()
- # Figure out the whole list of configs and ensure that no config is
- # listed in more than one category.
+ # Build a list of all of the configs referenced by builders.
all_configs = {}
- for config in self.common_dev_configs:
- all_configs[config] = 'common_dev_configs'
- for config in self.private_configs:
- if config in all_configs:
- errs.append('config "%s" listed in "private_configs" also '
- 'listed in "%s"' % (config, all_configs['config']))
- else:
- all_configs[config] = 'private_configs'
- for config in self.unsupported_configs:
- if config in all_configs:
- errs.append('config "%s" listed in "unsupported_configs" also '
- 'listed in "%s"' % (config, all_configs['config']))
- else:
- all_configs[config] = 'unsupported_configs'
-
for master in self.masters:
- for builder in self.masters[master]:
- config = self.masters[master][builder]
- if config in all_configs and all_configs[config] not in self.masters:
- errs.append('Config "%s" used by a bot is also listed in "%s".' %
- (config, all_configs[config]))
- else:
- all_configs[config] = master
+ for config in self.masters[master].values():
+ all_configs[config] = master
# Check that every referenced config actually exists.
for config, loc in all_configs.items():
@@ -568,12 +544,9 @@ class MetaBuildWrapper(object):
raise MBErr('Failed to parse config file "%s": %s' %
(self.args.config_file, e))
- self.common_dev_configs = contents['common_dev_configs']
self.configs = contents['configs']
self.masters = contents['masters']
self.mixins = contents['mixins']
- self.private_configs = contents['private_configs']
- self.unsupported_configs = contents['unsupported_configs']
def ConfigFromArgs(self):
if self.args.config:
« no previous file with comments | « no previous file | tools/mb/mb_config.pyl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698