Separate xvfb.py logic into its own script

tools/isolate/isolate.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Does one of the following depending on the --mode argument:
   check     verify all the inputs exist, touches the file specified with
             --result and exits.
   hashtable puts a manifest file and hard links each of the inputs into the
             output directory.
@@ skipping 103 matching lines @@
     print >> sys.stderr, 'Using first input %s as executable' % infiles[0]
     cmd = [infiles[0]]
   outdir = None
   try:
     outdir = tempfile.mkdtemp(prefix='isolate')
     tree_creator.recreate_tree(
         outdir, indir, infiles, tree_creator.HARDLINK)
     if read_only:
       tree_creator.make_writable(outdir, True)
 
-    # TODO(maruel): Remove me. Layering violation. Used by
-    # base/base_paths_linux.cc
-    env = os.environ.copy()
-    env['CR_SOURCE_ROOT'] = outdir.encode()
     # Rebase the command to the right path.
-    cmd[0] = os.path.join(outdir, cmd[0])
-    logging.info('Running %s' % cmd)
-    result = subprocess.call(cmd, cwd=outdir, env=env)
+    cwd = os.path.join(outdir, os.path.relpath(os.getcwd(), indir))
+    logging.info('Running %s, cwd=%s' % (cmd, cwd))
+    result = subprocess.call(cmd, cwd=cwd)
     if not result and resultfile:
       # Signal the build tool that the test succeeded.
       touch(resultfile)
     return result
   finally:
     if read_only:
       tree_creator.make_writable(outdir, False)
     rmtree(outdir)
 
 
@@ skipping 32 matching lines @@
       help='File to be touched when the command succeeds')
   parser.add_option(
       '--root', metavar='DIR', help='Base directory to fetch files, required')
   parser.add_option(
       '--outdir', metavar='DIR',
       help='Directory used to recreate the tree or store the hash table. '
            'Defaults to a /tmp subdirectory for modes run and remap.')
   parser.add_option(
       '--read-only', action='store_true',
       help='Make the temporary tree read-only')
+  parser.add_option(
+      '--files', metavar='FILE',
+      help='File to be read containing input files')
 
   options, args = parser.parse_args()
   level = [logging.ERROR, logging.INFO, logging.DEBUG][min(2, options.verbose)]
   logging.basicConfig(
       level=level,
       format='%(levelname)5s %(module)15s(%(lineno)3d): %(message)s')
 
   if not options.root:
     parser.error('--root is required.')
 
+  if options.files:
+    args = [
+        i.decode('utf-8')
+        for i in open(options.files, 'rb').read().splitlines() if i
+    ] + args
+
   infiles, cmd = separate_inputs_command(args, options.root)
   if not infiles:
     parser.error('Need at least one input file to map')
   # Preprocess the input files.
   try:
     infiles, root = tree_creator.preprocess_inputs(
           options.root, infiles, lambda x: re.match(r'.*\.(svn|pyc)$', x))
     return isolate(
         options.outdir,
         options.result,
         root,
         infiles,
         options.mode,
         options.read_only,
         cmd)
   except tree_creator.MappingError, e:
     print >> sys.stderr, str(e)
     return 1
 
 
 if __name__ == '__main__':
   sys.exit(main())