Copy fix_python_path() in more standalone files.

tools/isolate/run_test_from_archive.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.
 
 """Reads a manifest, creates a tree of hardlinks and runs the test.
 
 Keeps a local cache.
 """
 
@@ skipping 118 matching lines @@
   """Returns the number of free bytes."""
   if sys.platform == 'win32':
     free_bytes = ctypes.c_ulonglong(0)
     ctypes.windll.kernel32.GetDiskFreeSpaceExW(
         ctypes.c_wchar_p(path), None, None, ctypes.pointer(free_bytes))
     return free_bytes.value
   f = os.statvfs(path)
   return f.f_bfree * f.f_frsize
 
 
+def fix_python_path(cmd):
+  """Returns the fixed command line to call the right python executable."""
+  out = cmd[:]
+  if out[0] == 'python':
+    out[0] = sys.executable
+  elif out[0].endswith('.py'):
+    out.insert(0, sys.executable)
+  return out
+
+
 class Cache(object):
   """Stateful LRU cache.
 
   Saves its state as json file.
   """
   STATE_FILE = 'state.json'
 
   def __init__(self, cache_dir, remote, max_cache_size, min_free_space):
     """
     Arguments:
@@ skipping 111 matching lines @@
         os.chmod(outfile, properties['mode'])
 
     cwd = os.path.join(outdir, manifest['relative_cwd'])
     if not os.path.isdir(cwd):
       os.makedirs(cwd)
     if manifest.get('read_only'):
       make_writable(outdir, True)
     cmd = manifest['command']
     # Ensure paths are correctly separated on windows.
     cmd[0] = cmd[0].replace('/', os.path.sep)
+    cmd = fix_python_path(cmd)
     logging.info('Running %s, cwd=%s' % (cmd, cwd))
     try:
       return subprocess.call(cmd, cwd=cwd)
     except OSError:
       print >> sys.stderr, 'Failed to run %s; cwd=%s' % (cmd, cwd)
       raise
   finally:
     # Save first, in case an exception occur in the following lines, then clean
     # up.
     cache.save()
@@ skipping 46 matching lines @@
     parser.error('Unsupported args %s' % ' '.join(args))
 
   manifest = json.load(open_remote(options.manifest))
   return run_tha_test(
       manifest, os.path.abspath(options.cache), options.remote,
       options.max_cache_size, options.min_free_space)
 
 
 if __name__ == '__main__':
   sys.exit(main())