Rework how isolates are generated in MB.

testing/buildbot/manage.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.
 
 """Toolbox to manage all the json files in this directory.
 
 It can reformat them in their canonical format or ensures they are well
 formatted.
 """
@@ skipping 22 matching lines @@
 
   # These are not supported on Swarming yet.
   # http://crbug.com/472205
   'Chromium Mac 10.10',
   # http://crbug.com/441429
   'Linux Trusty (32)', 'Linux Trusty (dbg)(32)',
 
   # http://crbug.com/480053
   'Linux GN',
   'Linux GN (dbg)',
-  'linux_chromium_gn_rel',
 
   # Unmaintained builders on chromium.fyi
   'ClangToTMac',
   'ClangToTMacASan',
 
   # This builder is fine, but win8_chromium_ng uses GN and this configuration,
   # which breaks everything.
   'Win8 Aura',
 
   # One off builders. Note that Swarming does support ARM.
@@ skipping 77 matching lines @@
     if not isinstance(data['gtest_tests'], list):
       raise Error(
           '%s: %s is broken: %s' % (filename, builder, data['gtest_tests']))
     if not all(isinstance(g, dict) for g in data['gtest_tests']):
       raise Error(
           '%s: %s is broken: %s' % (filename, builder, data['gtest_tests']))
 
     for d in data['gtest_tests']:
       if (d['test'] not in ninja_targets and
           d['test'] not in SKIP_NINJA_TO_GN_TARGETS):
-        raise Error('%s: %s / %s is not listed in ninja_to_gn.pyl.' %
+        raise Error('%s: %s / %s is not listed in gn_isolate_map.pyl.' %
                     (filename, builder, d['test']))
       elif d['test'] in ninja_targets:
         ninja_targets_seen.add(d['test'])
 
     config[builder]['gtest_tests'] = sorted(
         data['gtest_tests'], key=lambda x: x['test'])
 
     # The trick here is that process_builder_remaining() is called before
     # process_builder_convert() so tests_location can be used to know how many
     # tests were converted.
@@ skipping 109 matching lines @@
       parser.error('A test name is required with --convert')
     if args.test_name + '.isolate' not in get_isolates():
       parser.error('Create %s.isolate first' % args.test_name)
 
   # Stats when running in --remaining mode;
   tests_location = collections.defaultdict(
       lambda: {
         'count_run_local': 0, 'count_run_on_swarming': 0, 'local_configs': {}
       })
 
-  with open(os.path.join(THIS_DIR, "ninja_to_gn.pyl")) as fp:
-    ninja_targets = ast.literal_eval(fp.read())
+  with open(os.path.join(THIS_DIR, "gn_isolate_map.pyl")) as fp:
+    gn_isolate_map = ast.literal_eval(fp.read())
+    ninja_targets = dict((k, v['label']) for k, v in gn_isolate_map.items())

[M-A Ruel, 2015/07/22 18:22:42]

Stylistically, I would have preferred:
ninja_targets = {k: v['label'] for k, v in gn_isolate_map.iteritems()}

:)

 
   try:
     result = 0
     ninja_targets_seen = set()
     for filepath in glob.glob(os.path.join(THIS_DIR, '*.json')):
       if not process_file(args.mode, args.test_name, tests_location, filepath,
                           ninja_targets, ninja_targets_seen):
         result = 1
 
     extra_targets = set(ninja_targets) - ninja_targets_seen
@@ skipping 10 matching lines @@
     elif args.mode == 'remaining':
       print_remaining(args.test_name, tests_location)
     return result
   except Error as e:
     sys.stderr.write('%s\n' % e)
     return 1
 
 
 if __name__ == "__main__":
   sys.exit(main())