Stop generating DEPTH in trace_inputs.py.

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 posixpath
 import re
 import subprocess
 import sys
 
 
 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'
@@ skipping 96 matching lines @@
 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
 
 
+def posix_relpath(path, root):
+  """posix.relpath() that keeps trailing slash."""
+  out = posixpath.relpath(path, root)
+  if path.endswith('/'):
+    out += '/'
+  return out
+
+
 class Strace(object):
   """strace implies linux."""
   IGNORED = (
     '/bin',
     '/dev',
     '/etc',
     '/lib',
     '/proc',
     '/sys',
     '/tmp',
@@ skipping 1142 matching lines @@
 
     def fix(f):
       """Bases the file on the most restrictive variable."""
       logging.debug('fix(%s)' % f)
       # Important, GYP stores the files with / and not \.
       if sys.platform == 'win32':
         f = f.replace('\\', '/')
 
       if product_dir and f.startswith(product_dir):
         return '<(PRODUCT_DIR)/%s' % f[len(product_dir):]
-      elif cwd_dir and f.startswith(cwd_dir):
+      else:
         # cwd_dir is usually the directory containing the gyp file. It may be
         # empty if the whole directory containing the gyp file is needed.
-        return f[len(cwd_dir):] or './'
-      else:
-        return '<(DEPTH)/%s' % f
+        return posix_relpath(f, cwd_dir) or './'
 
     corrected = [fix(f) for f in simplified]
     tracked = [f for f in corrected if not f.endswith('/') and ' ' not in f]
     untracked = [f for f in corrected if f.endswith('/') or ' ' in f]
     variables = {}
     if tracked:
       variables[KEY_TRACKED] = tracked
     if untracked:
       variables[KEY_UNTRACKED] = untracked
     value = {
@@ skipping 53 matching lines @@
       os.path.abspath(options.log),
       args,
       options.root_dir,
       options.cwd,
       options.product_dir,
       options.force)
 
 
 if __name__ == '__main__':
   sys.exit(main())