Add support for GN's --runtime-deps-list-file flag to 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.
 """
 
 import argparse
+import ast
 import collections
 import glob
 import json
 import os
 import subprocess
 import sys
 
 
 THIS_DIR = os.path.dirname(os.path.abspath(__file__))
 SRC_DIR = os.path.dirname(os.path.dirname(THIS_DIR))
@@ skipping 21 matching lines @@
   'ClangToTMac',
   'ClangToTMacASan',
 
   # One off builders. Note that Swarming does support ARM.
   'Linux ARM Cross-Compile',
   'Site Isolation Linux',
   'Site Isolation Win',
 }
 
 
+# TODO(GYP): These targets have not been ported to GN yet.
+SKIP_NINJA_TO_GN_TARGETS = {
+  'cast_media_unittests',
+  'cast_shell_browser_test',
+  'chromevox_tests',
+}
+
+
 class Error(Exception):
   """Processing error."""
 
 
 def get_isolates():
   """Returns the list of all isolate files."""
   files = subprocess.check_output(['git', 'ls-files'], cwd=SRC_DIR).splitlines()
   return [os.path.basename(f) for f in files if f.endswith('.isolate')]
 
 
@@ skipping 19 matching lines @@
   for test in data['gtest_tests']:
     name = test['test']
     if test.get('swarming', {}).get('can_use_on_swarming_builders'):
       tests_location[name]['count_run_on_swarming'] += 1
     else:
       tests_location[name]['count_run_local'] += 1
       tests_location[name]['local_configs'].setdefault(
           filename, []).append(builder)
 
 
-def process_file(mode, test_name, tests_location, filepath):
+def process_file(mode, test_name, tests_location, filepath, ninja_targets,
+                 ninja_targets_seen):
   """Processes a file.
 
   The action depends on mode. Updates tests_location.
 
   Return False if the process exit code should be 1.
   """
   filename = os.path.basename(filepath)
   with open(filepath) as f:
     content = f.read()
   try:
     config = json.loads(content)
   except ValueError as e:
     raise Error('Exception raised while checking %s: %s' % (filepath, e))
 
   for builder, data in sorted(config.iteritems()):
     if builder in SKIP:
       # Oddities.
       continue
     if not isinstance(data, dict):
       raise Error('%s: %s is broken: %s' % (filename, builder, data))
     if 'gtest_tests' not in data:
       continue
     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 (not d['test'] in ninja_targets and

[Paweł Hajdan Jr., 2015/06/10 09:30:08]

nit: Consider "d['test'] not in ninja_targets" instead - would be more readable
and consistent with line below.

[Dirk Pranke, 2015/06/10 16:07:59]

will fix.

+          d['test'] not in SKIP_NINJA_TO_GN_TARGETS):
+        raise Error('%s: %s / %s is not listed in ninja_to_gn.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'])
     if mode == 'remaining':
       process_builder_remaining(data, filename, builder, tests_location)
     elif mode == 'convert':
       process_builder_convert(data, filename, builder, test_name)
 
   expected = json.dumps(
       config, sort_keys=True, indent=2, separators=(',', ': ')) + '\n'
   if content != expected:
@@ skipping 82 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())
+
   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):
+      if not process_file(args.mode, args.test_name, tests_location, filepath,
+                          ninja_targets, ninja_targets_seen):
         result = 1
 
+    extra_targets = set(ninja_targets.keys()) - ninja_targets_seen

[M-A Ruel, 2015/06/10 14:53:40]

set(ninja_targets)

[Dirk Pranke, 2015/06/10 16:07:59]

will fix.

+    if extra_targets:
+      if len(extra_targets) > 1:
+        extra_targets_str = ', '.join(extra_targets) + ' are'
+      else:
+        extra_targets_str = list(extra_targets)[0] + ' is'
+      raise Error('%s listed in ninja_to_gn.pyl but not in any .json files' %
+                  extra_targets_str)
+
     if 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())