Optionally support relative include paths in cpp_checker.py

checkdeps/checkdeps.py

 #!/usr/bin/env python
 # Copyright 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.
 
 """Makes sure that files include headers from allowed directories.
 
 Checks DEPS files in the source tree for rules, and applies those rules to
 "#include" and "import" directives in the .cpp and .java source files.
 Any source file including something not permitted by the DEPS files will fail.
@@ skipping 24 matching lines @@
 class DepsChecker(DepsBuilder):
   """Parses include_rules from DEPS files and verifies files in the
   source tree against them.
   """
 
   def __init__(self,
                base_directory=None,
                verbose=False,
                being_tested=False,
                ignore_temp_rules=False,
-               skip_tests=False):
+               skip_tests=False,
+               resolve_dotdot=False):
     """Creates a new DepsChecker.
 
     Args:
       base_directory: OS-compatible path to root of checkout, e.g. C:\chr\src.
       verbose: Set to true for debug output.
       being_tested: Set to true to ignore the DEPS file at tools/checkdeps/DEPS.
       ignore_temp_rules: Ignore rules that start with Rule.TEMP_ALLOW ("!").
     """
     DepsBuilder.__init__(
         self, base_directory, verbose, being_tested, ignore_temp_rules)
 
     self._skip_tests = skip_tests
+    self._resolve_dotdot = resolve_dotdot
     self.results_formatter = results.NormalResultsFormatter(verbose)
 
   def Report(self):
     """Prints a report of results, and returns an exit code for the process."""
     if self.results_formatter.GetResults():
       self.results_formatter.PrintResults()
       return 1
     print '\nSUCCESS\n'
     return 0
 
   def CheckDirectory(self, start_dir):
     """Checks all relevant source files in the specified directory and
     its subdirectories for compliance with DEPS rules throughout the
     tree (starting at |self.base_directory|).  |start_dir| must be a
     subdirectory of |self.base_directory|.
 
     On completion, self.results_formatter has the results of
     processing, and calling Report() will print a report of results.
     """
     java = java_checker.JavaChecker(self.base_directory, self.verbose)
-    cpp = cpp_checker.CppChecker(self.verbose)
+    cpp = cpp_checker.CppChecker(
+        self.verbose, self._resolve_dotdot, self.base_directory)
     checkers = dict(
         (extension, checker)
         for checker in [java, cpp] for extension in checker.EXTENSIONS)
     self._CheckDirectoryImpl(checkers, start_dir)
 
   def _CheckDirectoryImpl(self, checkers, dir_name):
     rules = self.GetDirectoryRules(dir_name)
     if rules is None:
       return
 
@@ skipping 96 matching lines @@
       '', '--skip-tests',
       action='store_true', dest='skip_tests', default=False,
       help='Skip checking test files (best effort).')
   option_parser.add_option(
       '-v', '--verbose',
       action='store_true', default=False,
       help='Print debug logging')
   option_parser.add_option(
       '', '--json',
       help='Path to JSON output file')
+  option_parser.add_option(
+      '', '--resolve-dotdot',
+      action='store_true', dest='resolve_dotdot', default=False,
+      help='resolve leading ../ in include directive paths relative '
+           'to the file perfoming the inclusion.')
+
   options, args = option_parser.parse_args()
 
   deps_checker = DepsChecker(options.base_directory,
                              verbose=options.verbose,
                              ignore_temp_rules=options.ignore_temp_rules,
-                             skip_tests=options.skip_tests)
+                             skip_tests=options.skip_tests,
+                             resolve_dotdot=options.resolve_dotdot)
   base_directory = deps_checker.base_directory  # Default if needed, normalized
 
   # Figure out which directory we have to check.
   start_dir = base_directory
   if len(args) == 1:
     # Directory specified. Start here. It's supposed to be relative to the
     # base directory.
     start_dir = os.path.abspath(os.path.join(base_directory, args[0]))
   elif len(args) >= 2 or (options.generate_temp_rules and
                           options.count_violations):
@@ skipping 17 matching lines @@
   if options.json:
     deps_checker.results_formatter = results.JSONResultsFormatter(
         options.json, deps_checker.results_formatter)
 
   deps_checker.CheckDirectory(start_dir)
   return deps_checker.Report()
 
 
 if '__main__' == __name__:
   sys.exit(main())