Add isolate for content_browsertests with --site-per-process.

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 527 matching lines @@
         # "_apk" targets may be either android_apk or executable. The former
         # will result in runtime_deps associated with the stamp file, while the
         # latter will result in runtime_deps associated with the executable.
         target_name = self.GNTargetName(target)
         label = gn_isolate_map[target_name]['label']
         runtime_deps_targets = [
             target_name,
             'obj/%s.stamp' % label.replace(':', '/')]
       elif gn_isolate_map[target]['type'] == 'gpu_browser_test':
         runtime_deps_targets = ['browser_tests']
-      elif gn_isolate_map[target]['type'] == 'script':
+      elif (gn_isolate_map[target]['type'] == 'script' or
+            gn_isolate_map[target].get('label_type') == 'group'):
         # For script targets, the build target is usually a group,
         # for which gn generates the runtime_deps next to the stamp file
         # for the label, which lives under the obj/ directory.
         label = gn_isolate_map[target]['label']
         runtime_deps_targets = ['obj/%s.stamp' % label.replace(':', '/')]
       else:
         runtime_deps_targets = [target]
 
       if self.platform == 'win32':
         deps_paths = [
@@ skipping 133 matching lines @@
     # use_x11 = is_linux && !use_ozone.
     # TODO(dpranke): Figure out how to keep this in sync better.
     use_x11 = (self.platform == 'linux2' and
                not android and
                not 'use_ozone=true' in vals['gn_args'])
 
     asan = 'is_asan=true' in vals['gn_args']
     msan = 'is_msan=true' in vals['gn_args']
     tsan = 'is_tsan=true' in vals['gn_args']
 
+    target_name = self.GNTargetName(target)
+    test_type = gn_isolate_map[target_name]['type']
+
+    executable = gn_isolate_map[target_name].get('executable', target_name)
     executable_suffix = '.exe' if self.platform == 'win32' else ''
 
-    target_name = self.GNTargetName(target)
-    test_type = gn_isolate_map[target_name]['type']
     cmdline = []
     extra_files = []
 
     if android:
       # TODO(jbudorick): This won't work with instrumentation test targets.
       # Revisit this logic when those are added to gn_isolate_map.pyl.
       cmdline = [self.PathJoin('bin', 'run_%s' % target_name)]
     elif use_x11 and test_type == 'windowed_test_launcher':
       extra_files = [
           'xdisplaycheck',
           '../../testing/test_env.py',
           '../../testing/xvfb.py',
       ]
       cmdline = [
-          '../../testing/xvfb.py',
-          '.',
-          './' + str(target),
-          '--brave-new-test-launcher',
-          '--test-launcher-bot-mode',
-          '--asan=%d' % asan,
-          '--msan=%d' % msan,
-          '--tsan=%d' % tsan,
+        '../../testing/xvfb.py',
+        '.',
+        './' + str(executable) + executable_suffix,
+        '--brave-new-test-launcher',
+        '--test-launcher-bot-mode',
+        '--asan=%d' % asan,
+        '--msan=%d' % msan,
+        '--tsan=%d' % tsan,
       ]
     elif test_type in ('windowed_test_launcher', 'console_test_launcher'):
       extra_files = [
           '../../testing/test_env.py'
       ]
       cmdline = [
           '../../testing/test_env.py',
-          './' + str(target) + executable_suffix,
+          './' + str(executable) + executable_suffix,
           '--brave-new-test-launcher',
           '--test-launcher-bot-mode',
           '--asan=%d' % asan,
           '--msan=%d' % msan,
           '--tsan=%d' % tsan,
       ]
     elif test_type == 'gpu_browser_test':
       extra_files = [
           '../../testing/test_env.py'
       ]
       gtest_filter = gn_isolate_map[target]['gtest_filter']
       cmdline = [
           '../../testing/test_env.py',
           './browser_tests' + executable_suffix,
           '--test-launcher-bot-mode',
           '--enable-gpu',
           '--test-launcher-jobs=1',
           '--gtest_filter=%s' % gtest_filter,
       ]
     elif test_type == 'script':
       extra_files = [
           '../../testing/test_env.py'
       ]
       cmdline = [
           '../../testing/test_env.py',
           '../../' + self.ToSrcRelPath(gn_isolate_map[target]['script'])
-      ] + gn_isolate_map[target].get('args', [])
+      ]
     elif test_type in ('raw'):
       extra_files = []
       cmdline = [
           './' + str(target) + executable_suffix,
-      ] + gn_isolate_map[target].get('args')
+      ]
 
     else:
       self.WriteFailureAndRaise('No command line for %s found (test type %s).'
                                 % (target, test_type), output_path=None)
 
+    cmdline += gn_isolate_map[target].get('args', [])
+
     return cmdline, extra_files
 
   def ToAbsPath(self, build_path, *comps):
     return self.PathJoin(self.chromium_src_dir,
                          self.ToSrcRelPath(build_path),
                          *comps)
 
   def ToSrcRelPath(self, path):
     """Returns a relative path from the top of the repo."""
     # TODO: Support normal paths in addition to source-absolute paths.
@@ skipping 332 matching lines @@
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except MBErr as e:
     print(e)
     sys.exit(1)
   except KeyboardInterrupt:
     print("interrupted, exiting", stream=sys.stderr)
     sys.exit(130)