Add 2 config names for builder 'Blimp Android Tester'

tools/mb/mb.py

 #!/usr/bin/env python
 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """MB - the Meta-Build wrapper around GYP and GN
 
 MB is a wrapper script for GYP and GN that can be used to generate build files
 for sets of canned configurations and analyze them.
 """
@@ skipping 60 matching lines @@
       return 1
 
   def ParseArgs(self, argv):
     def AddCommonOptions(subp):
       subp.add_argument('-b', '--builder',
                         help='builder name to look up config from')
       subp.add_argument('-m', '--master',
                         help='master name to look up config from')
       subp.add_argument('-c', '--config',
                         help='configuration to analyze')
-      subp.add_argument('--phase', type=int,
-                        help=('build phase for a given build '
-                              '(int in [1, 2, ...))'))
+      subp.add_argument('--phase',
+                        help=('build phase dict for a given build (key in '

[Dirk Pranke, 2016/10/11 00:14:05]

I would replace the help with something like help='optional phase name (used
when builders do multiple compiles with different arguments in a single build)'.
I don't think we need to explain that the name is a key to a dict in the help.

[shenghuazhang, 2016/10/11 01:09:27]

Done.

+                              '([ "key1": "config1", "key2": "config2", ...])'))
       subp.add_argument('-f', '--config-file', metavar='PATH',
                         default=self.default_config,
                         help='path to config file '
                             '(default is //tools/mb/mb_config.pyl)')
       subp.add_argument('-g', '--goma-dir',
                         help='path to goma directory')
       subp.add_argument('--gyp-script', metavar='PATH',
                         default=self.PathJoin('build', 'gyp_chromium'),
                         help='path to gyp script relative to project root '
                              '(default is %(default)s)')
@@ skipping 169 matching lines @@
   def CmdExport(self):
     self.ReadConfigFile()
     obj = {}
     for master, builders in self.masters.items():
       obj[master] = {}
       for builder in builders:
         config = self.masters[master][builder]
         if not config:
           continue
 
-        if isinstance(config, list):
-          args = [self.FlattenConfig(c)['gn_args'] for c in config]
+        if isinstance(config, dict):
+          args = {k: self.FlattenConfig(v)['gn_args']
+                  for k, v in config.items()}
         elif config.startswith('//'):
           args = config
         else:
           args = self.FlattenConfig(config)['gn_args']
           if 'error' in args:
             continue
 
         obj[master][builder] = args
 
     # Dump object and trim trailing whitespace.
@@ skipping 77 matching lines @@
   def CmdValidate(self, print_ok=True):
     errs = []
 
     # Read the file to make sure it parses.
     self.ReadConfigFile()
 
     # Build a list of all of the configs referenced by builders.
     all_configs = {}
     for master in self.masters:
       for config in self.masters[master].values():
-        if isinstance(config, list):
-          for c in config:
+        if isinstance(config, dict):
+          for c in config.values():
             all_configs[c] = master
         else:
           all_configs[config] = master
 
     # Check that every referenced args file or config actually exists.
     for config, loc in all_configs.items():
       if config.startswith('//'):
         if not self.Exists(self.ToAbsPath(config)):
           errs.append('Unknown args file "%s" referenced from "%s".' %
                       (config, loc))
@@ skipping 130 matching lines @@
       config_only = config_builders - master_builders
       tbd = set()
       gyp = set()
       done = set()
       notes = {builder: '' for builder in config_builders | master_builders}
 
       for builder in both:
         config = self.masters[master][builder]
         if config == 'tbd':
           tbd.add(builder)
-        elif isinstance(config, list):
-          vals = self.FlattenConfig(config[0])
+        elif isinstance(config, dict):
+          vals = self.FlattenConfig(config.values()[0])
           if vals['type'] == 'gyp':
             gyp.add(builder)
           else:
             done.add(builder)
         elif config.startswith('//'):
           done.add(builder)
         else:
           vals = self.FlattenConfig(config)
           if vals['type'] == 'gyp':
             gyp.add(builder)
@@ skipping 150 matching lines @@
 
     if not self.args.master in self.masters:
       raise MBErr('Master name "%s" not found in "%s"' %
                   (self.args.master, self.args.config_file))
 
     if not self.args.builder in self.masters[self.args.master]:
       raise MBErr('Builder name "%s"  not found under masters[%s] in "%s"' %
                   (self.args.builder, self.args.master, self.args.config_file))
 
     config = self.masters[self.args.master][self.args.builder]
-    if isinstance(config, list):
+    if isinstance(config, dict):
       if self.args.phase is None:
         raise MBErr('Must specify a build --phase for %s on %s' %
                     (self.args.builder, self.args.master))
-      phase = int(self.args.phase)
-      if phase < 1 or phase > len(config):
-        raise MBErr('Phase %d out of bounds for %s on %s' %
+      phase = str(self.args.phase)
+      if phase not in config:
+        raise MBErr('Phase %s doesn\'t exist for %s on %s' %
                     (phase, self.args.builder, self.args.master))
-      return config[phase-1]
+      return config[phase]
 
     if self.args.phase is not None:
       raise MBErr('Must not specify a build --phase for %s on %s' %
                   (self.args.builder, self.args.master))
     return config
 
   def FlattenConfig(self, config):
     mixins = self.configs[config]
     vals = self.DefaultVals()
 
@@ skipping 836 matching lines @@
   # Then check to see if the arg contains any metacharacters other than
   # double quotes; if it does, quote everything (including the double
   # quotes) for safety.
   if any(a in UNSAFE_FOR_CMD for a in arg):
     arg = ''.join('^' + a if a in ALL_META_CHARS else a for a in arg)
   return arg
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))