Convert isolate.py to exclusively use .isolate files.

tools/isolate/trace_inputs.py

 #!/usr/bin/env python
 # coding=utf-8
 # 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.
 
 """Runs strace or dtrace on a test and processes the logs to extract the
 dependencies from the source tree.
 
 Automatically extracts directories where all the files are used to make the
 dependencies list more compact.
 """
 
 import codecs
 import csv
 import logging
 import optparse
 import os
 import re
 import subprocess
 import sys
 from xml.etree import ElementTree
 
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 ROOT_DIR = os.path.dirname(os.path.dirname(BASE_DIR))
 
+KEY_TRACKED = 'isolate_dependency_tracked'
+KEY_UNTRACKED = 'isolate_dependency_untracked'
+
 
 if sys.platform == 'win32':
   from ctypes.wintypes import create_unicode_buffer
   from ctypes.wintypes import windll, FormatError  # pylint: disable=E0611
   from ctypes.wintypes import GetLastError  # pylint: disable=E0611
 
 
   def QueryDosDevice(drive_letter):
     """Returns the Windows 'native' path for a DOS drive letter."""
     assert re.match(r'^[a-zA-Z]:$', drive_letter), drive_letter
@@ skipping 75 matching lines @@
     'freebsd7': 'freebsd',
     'freebsd8': 'freebsd',
   }
   return flavors.get(sys.platform, 'linux')
 
 
 def isEnabledFor(level):
   return logging.getLogger().isEnabledFor(level)
 
 
+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 Strace(object):
   """strace implies linux."""
   IGNORED = (
     '/bin',
     '/dev',
     '/etc',
     '/lib',
     '/proc',
     '/sys',
     '/tmp',
@@ skipping 1031 matching lines @@
   - force_trace: Will force to trace unconditionally even if a trace already
                  exist.
   """
   logging.debug(
       'trace_inputs(%s, %s, %s, %s, %s, %s)' % (
         logfile, cmd, root_dir, cwd_dir, product_dir, force_trace))
 
   # It is important to have unambiguous path.
   assert os.path.isabs(root_dir), root_dir
   assert os.path.isabs(logfile), logfile
+  assert not cwd_dir or not os.path.isabs(cwd_dir), cwd_dir
+  assert not product_dir or not os.path.isabs(product_dir), product_dir
+
+  cmd = fix_python_path(cmd)
   assert (
       (os.path.isfile(logfile) and not force_trace) or os.path.isabs(cmd[0])
       ), cmd[0]
-  assert not cwd_dir or not os.path.isabs(cwd_dir), cwd_dir
-  assert not product_dir or not os.path.isabs(product_dir), product_dir
 
   # Resolve any symlink
   root_dir = os.path.realpath(root_dir)
 
   if sys.platform == 'win32':
     # Help ourself and lowercase all the paths.
     # TODO(maruel): handle short path names by converting them to long path name
     # as needed.
     root_dir = root_dir.lower()
     if cwd_dir:
@@ skipping 82 matching lines @@
         # empty if the whole directory containing the gyp file is needed.
         return f[len(cwd_dir):] or './'
       else:
         return '<(DEPTH)/%s' % f
 
     corrected = [fix(f) for f in simplified]
     files = [f for f in corrected if not f.endswith('/')]
     dirs = [f for f in corrected if f.endswith('/')]
     variables = {}
     if files:
-      variables['isolate_files'] = files
+      variables[KEY_TRACKED] = files
     if dirs:
-      variables['isolate_dirs'] = dirs
+      variables[KEY_UNTRACKED] = dirs
     value = {
       'conditions': [
         ['OS=="%s"' % flavor, {
           'variables': variables,
         }],
       ],
     }
     pretty_print(value, sys.stdout)
   return 0
 
@@ skipping 44 matching lines @@
       os.path.abspath(options.log),
       args,
       options.root_dir,
       options.cwd,
       options.product_dir,
       options.force)
 
 
 if __name__ == '__main__':
   sys.exit(main())