Add handling for logging and gtest comparison macros.

tools/clang/scripts/test_tool.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
 """Test harness for chromium clang tools."""
 
 import difflib
 import glob
 import json
 import os
 import os.path
 import subprocess
 import shutil
 import sys
 
 
 def _GenerateCompileCommands(files, include_paths):
   """Returns a JSON string containing a compilation database for the input."""
-  include_path_flags = ''.join('-I %s' % include_path
+  include_path_flags = ' '.join('-I %s' % include_path
                                for include_path in include_paths)
   return json.dumps([{'directory': '.',
                       'command': 'clang++ -fsyntax-only %s -c %s' % (
                           include_path_flags, f),
                       'file': f} for f in files], indent=2)
 
 
 def _NumberOfTestsToString(tests):
   """Returns an English describing the number of tests."""
   return "%d test%s" % (tests, 's' if tests != 1 else '')
@@ skipping 13 matching lines @@
   compile_database = os.path.join(test_directory_for_tool,
                                   'compile_commands.json')
   source_files = glob.glob(os.path.join(test_directory_for_tool,
                                         '*-original.cc'))
   actual_files = ['-'.join([source_file.rsplit('-', 1)[0], 'actual.cc'])
                   for source_file in source_files]
   expected_files = ['-'.join([source_file.rsplit('-', 1)[0], 'expected.cc'])
                     for source_file in source_files]
   include_paths = []
   include_paths.append(
       os.path.realpath(os.path.join(tools_clang_directory, '../..')))

[Ryan Sleevi, 2014/08/23 03:26:36]

Ooof. I didn't realize we'd done this.

I had tried to keep the original tool fully hermetic. I can understand the need
for gtest, but it seems unfortunate to mix tool and Chromium code.

+  # Many gtest headers expect to have testing/gtest/include in the include
+  # search path.
+  include_paths.append(
+      os.path.realpath(os.path.join(tools_clang_directory,
+                                    '../..',
+                                    'testing/gtest/include')))
 
   try:
     # Set up the test environment.
     for source, actual in zip(source_files, actual_files):
       shutil.copyfile(source, actual)
     # Stage the test files in the git index. If they aren't staged, then
     # run_tools.py will skip them when applying replacements.
     args = ['git', 'add']
     args.extend(actual_files)
     subprocess.check_call(args)
@@ skipping 46 matching lines @@
   finally:
     # No matter what, unstage the git changes we made earlier to avoid polluting
     # the index.
     args = ['git', 'reset', '--quiet', 'HEAD']
     args.extend(actual_files)
     subprocess.call(args)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))