Fix MB and running mash browser_tests under swarming

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 107 matching lines @@
     subp.add_argument('target', nargs=1,
                       help='ninja target to generate the isolate for')
     subp.set_defaults(func=self.CmdIsolate)
 
     subp = subps.add_parser('lookup',
                             help='look up the command for a given config or '
                                  'builder')
     AddCommonOptions(subp)
     subp.set_defaults(func=self.CmdLookup)
 
-    subp = subps.add_parser('run',
-                            help='build and run the isolated version of a '
-                                 'binary')
+    subp = subps.add_parser(
+        'run',
+        help='build and run the isolated version of a '
+             'binary',
+        formatter_class=argparse.RawDescriptionHelpFormatter)
+    subp.description = (
+        'Build, isolate, and run the given binary with the command line\n'
+        'listed in the isolate. You may pass extra arguments after the\n'
+        'target; use "--" if the extra arguments need to include switches.\n'
+        '\n'
+        'Examples:\n'
+        '\n'
+        '  % tools/mb/mb.py run -m chromium.linux -b "Linux Builder" \\\n'
+        '    //out/Default content_browsertests\n'
+        '\n'
+        '  % tools/mb/mb.py run out/Default content_browsertests\n'
+        '\n'
+        '  % tools/mb/mb.py run out/Default content_browsertests -- \\\n'
+        '    --test-launcher-retry-limit=0'
+        '\n'
+    )
+
     AddCommonOptions(subp)
     subp.add_argument('-j', '--jobs', dest='jobs', type=int,
                       help='Number of jobs to pass to ninja')
     subp.add_argument('--no-build', dest='build', default=True,
                       action='store_false',
                       help='Do not build, just isolate and run')
     subp.add_argument('path', nargs=1,
-                      help='path to generate build into')
+                      help=('path to generate build into (or use).'
+                            ' This can be either a regular path or a '
+                            'GN-style source-relative path like '
+                            '//out/Default.'))
     subp.add_argument('target', nargs=1,
                       help='ninja target to build and run')
+    subp.add_argument('extra_args', nargs='*',
+                      help=('extra args to pass to the isolate to run. Use '
+                            '"--" as the first arg if you need to pass '
+                            'switches'))
     subp.set_defaults(func=self.CmdRun)
 
     subp = subps.add_parser('validate',
                             help='validate the config file')
     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.set_defaults(func=self.CmdValidate)
 
@@ skipping 95 matching lines @@
         if ret:
           return ret
       ret = self.RunGNIsolate(vals)
       if ret:
         return ret
     else:
       ret = self.Build('%s_run' % target)
       if ret:
         return ret
 
-    ret, _, _ = self.Run([
+    cmd = [
         self.executable,
         self.PathJoin('tools', 'swarming_client', 'isolate.py'),
         'run',
         '-s',
-        self.ToSrcRelPath('%s/%s.isolated' % (build_dir, target))],
-        force_verbose=False, buffer_output=False)
+        self.ToSrcRelPath('%s/%s.isolated' % (build_dir, target)),
+    ]
+    if self.args.extra_args:
+        cmd += ['--'] + self.args.extra_args
+
+    ret, _, _ = self.Run(cmd, force_verbose=False, buffer_output=False)
 
     return ret
 
   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.
@@ skipping 476 matching lines @@
 
     build_dir = self.args.path[0]
     target = self.args.target[0]
     target_name = self.GNTargetName(target)
     command, extra_files = self.GetIsolateCommand(target, vals, gn_isolate_map)
 
     label = gn_isolate_map[target_name]['label']
     cmd = self.GNCmd('desc', build_dir, extra_args=[label, 'runtime_deps'])
     ret, out, _ = self.Call(cmd)
     if ret:
+      if out:
+        self.Print(out)
       return ret
 
     runtime_deps = out.splitlines()
 
     self.WriteIsolateFiles(build_dir, command, target, runtime_deps,
                            extra_files)
 
     ret, _, _ = self.Run([
         self.executable,
         self.PathJoin('tools', 'swarming_client', 'isolate.py'),
@@ skipping 171 matching lines @@
 
     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.
-    assert(path.startswith('//'))
-    return path[2:].replace('/', self.sep)
+    if path.startswith('//'):
+      return path[2:].replace('/', self.sep)
+    return self.RelPath(path, self.chromium_src_dir)
 
   def ParseGYPConfigPath(self, path):
     rpath = self.ToSrcRelPath(path)
     output_dir, _, _ = rpath.rpartition(self.sep)
     return output_dir
 
   def GYPCmd(self, output_dir, vals):
     gyp_defines = vals['gyp_defines']
     goma_dir = self.args.goma_dir
 
@@ skipping 181 matching lines @@
     print_env('GYP_CROSSCOMPILE')
     print_env('GYP_DEFINES')
 
     if cmd[0] == self.executable:
       cmd = ['python'] + cmd[1:]
     self.Print(*[shell_quoter(arg) for arg in cmd])
 
   def PrintJSON(self, obj):
     self.Print(json.dumps(obj, indent=2, sort_keys=True))
 
-  def Print(self, *args, **kwargs):
-    # This function largely exists so it can be overridden for testing.
-    print(*args, **kwargs)
+  def GNTargetName(self, target):
+    return target[:-len('_apk')] if target.endswith('_apk') else target
 
   def Build(self, target):
     build_dir = self.ToSrcRelPath(self.args.path[0])
     ninja_cmd = ['ninja', '-C', build_dir]
     if self.args.jobs:
       ninja_cmd.extend(['-j', '%d' % self.args.jobs])
     ninja_cmd.append(target)
     ret, _, _ = self.Run(ninja_cmd, force_verbose=False, buffer_output=False)
     return ret
 
@@ skipping 29 matching lines @@
 
   def ExpandUser(self, path):
     # This function largely exists so it can be overridden for testing.
     return os.path.expanduser(path)
 
   def Exists(self, path):
     # This function largely exists so it can be overridden for testing.
     return os.path.exists(path)
 
   def Fetch(self, url):
-
+    # This function largely exists so it can be overridden for testing.
     f = urllib2.urlopen(url)
     contents = f.read()
     f.close()
     return contents
 
-  def GNTargetName(self, target):
-    return target[:-len('_apk')] if target.endswith('_apk') else target
-
   def MaybeMakeDirectory(self, path):
     try:
       os.makedirs(path)
     except OSError, e:
       if e.errno != errno.EEXIST:
         raise
 
   def PathJoin(self, *comps):
     # This function largely exists so it can be overriden for testing.
     return os.path.join(*comps)
 
+  def Print(self, *args, **kwargs):
+    # This function largely exists so it can be overridden for testing.
+    print(*args, **kwargs)
+
   def ReadFile(self, path):
     # This function largely exists so it can be overriden for testing.
     with open(path) as fp:
       return fp.read()
 
+  def RelPath(self, path, start='.'):
+    # This function largely exists so it can be overriden for testing.
+    return os.path.relpath(path, start)
+
   def RemoveFile(self, path):
     # This function largely exists so it can be overriden for testing.
     os.remove(path)
 
   def RemoveDirectory(self, abs_path):
     if self.platform == 'win32':
       # In other places in chromium, we often have to retry this command
       # because we're worried about other processes still holding on to
       # file handles, but when MB is invoked, it will be early enough in the
       # build that their should be no other processes to interfere. We
@@ skipping 42 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:]))